diff --git a/cmake/macros/MemoryDebugger.cmake b/cmake/macros/MemoryDebugger.cmake
index ed80e03c6b..09716715f0 100644
--- a/cmake/macros/MemoryDebugger.cmake
+++ b/cmake/macros/MemoryDebugger.cmake
@@ -16,9 +16,9 @@ if (HIFI_MEMORY_DEBUGGING)
   if (UNIX)
     if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
         # for clang on Linux
-        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-omit-frame-pointer -fsanitize=undefined -fsanitize=address -fsanitize-recover=address")
-        SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=undefined -fsanitize=address -fsanitize-recover=address")
-        SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=undefined -fsanitize=address -fsanitize-recover=address")
+        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-omit-frame-pointer -shared-libasan -fsanitize=undefined -fsanitize=address -fsanitize-recover=address")
+        SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -shared-libasan -fsanitize=undefined -fsanitize=address -fsanitize-recover=address")
+        SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -shared-libasan -fsanitize=undefined -fsanitize=address -fsanitize-recover=address")
     else ()
         # for gcc on Linux
         SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=undefined -fsanitize=address -U_FORTIFY_SOURCE -fno-stack-protector -fno-omit-frame-pointer")
diff --git a/libraries/graphics/src/graphics/Stage.cpp b/libraries/graphics/src/graphics/Stage.cpp
index 312ece6889..21929a61dd 100644
--- a/libraries/graphics/src/graphics/Stage.cpp
+++ b/libraries/graphics/src/graphics/Stage.cpp
@@ -223,8 +223,8 @@ void SunSkyStage::setSunDirection(const Vec3& direction) {
     }
 }
 
-// THe sun declinaison calculus is taken from https://en.wikipedia.org/wiki/Position_of_the_Sun
-double evalSunDeclinaison(double dayNumber) {
+// The sun declination calculus is taken from https://en.wikipedia.org/wiki/Position_of_the_Sun
+double evalSunDeclination(double dayNumber) {
     return -(23.0 + 44.0/60.0)*cos(glm::radians((360.0/365.0)*(dayNumber + 10.0)));
 }
 
@@ -235,8 +235,8 @@ void SunSkyStage::updateGraphicsObject() const {
     float sunLongitude = _earthSunModel.getLongitude() + (MAX_LONGITUDE * signedNormalizedDayTime);
     _earthSunModel.setSunLongitude(sunLongitude);
 
-    // And update the sunLAtitude as the declinaison depending of the time of the year
-    _earthSunModel.setSunLatitude(evalSunDeclinaison(_yearTime)); 
+    // And update the sunLatitude as the declination depending of the time of the year
+    _earthSunModel.setSunLatitude(evalSunDeclination(_yearTime)); 
 
     if (isSunModelEnabled()) {
         Vec3d sunLightDir = -_earthSunModel.getSurfaceSunDir();
diff --git a/tools/dissectors/1-hfudt.lua b/tools/dissectors/1-hfudt.lua
index 9ad89462f9..3993b2d7a0 100644
--- a/tools/dissectors/1-hfudt.lua
+++ b/tools/dissectors/1-hfudt.lua
@@ -39,9 +39,9 @@ p_hfudt.fields = {
 
 local control_types = {
   [0] = { "ACK", "Acknowledgement" },
-  [5] = { "Handshake", "Handshake" },
-  [6] = { "HandshakeACK", "Acknowledgement of Handshake" },
-  [8] = { "HandshakeRequest", "Request a Handshake" }
+  [1] = { "Handshake", "Handshake" },
+  [2] = { "HandshakeACK", "Acknowledgement of Handshake" },
+  [3] = { "HandshakeRequest", "Request a Handshake" }
 }
 
 local message_positions = {