diff --git a/ext/ghoul b/ext/ghoul
index 3f18f3180a..f31ddda5d7 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit 3f18f3180adea252ce14a1622ffc965031f385b5
+Subproject commit f31ddda5d7104f0625059ff00880463a34bdaa6d
diff --git a/modules/kameleon/ext/kameleon b/modules/kameleon/ext/kameleon
index 95eee93aab..f9ba0caae4 160000
--- a/modules/kameleon/ext/kameleon
+++ b/modules/kameleon/ext/kameleon
@@ -1 +1 @@
-Subproject commit 95eee93aabf35465adfafe234296df43080fe5df
+Subproject commit f9ba0caae41dc13a752c71a2e873c02bb0dce7c3
diff --git a/modules/toyvolume/rendering/renderabletoyvolume.cpp b/modules/toyvolume/rendering/renderabletoyvolume.cpp
index 23e1a1d670..59c93d426f 100644
--- a/modules/toyvolume/rendering/renderabletoyvolume.cpp
+++ b/modules/toyvolume/rendering/renderabletoyvolume.cpp
@@ -118,12 +118,12 @@ bool RenderableToyVolume::isReady() const {
 void RenderableToyVolume::update(const UpdateData& data) {
     if (_raycaster) {
 
-        glm::mat4 transform = glm::translate(glm::mat4(1.0), static_cast<glm::vec3>(_translation) * std::powf(10.0, static_cast<float>(_scalingExponent)));
+        glm::mat4 transform = glm::translate(glm::mat4(1.0), static_cast<glm::vec3>(_translation) * std::pow(10.0f, static_cast<float>(_scalingExponent)));
         glm::vec3 eulerRotation = static_cast<glm::vec3>(_rotation);
         transform = glm::rotate(transform, eulerRotation.x, glm::vec3(1, 0, 0));
         transform = glm::rotate(transform, eulerRotation.y, glm::vec3(0, 1, 0));
         transform = glm::rotate(transform, eulerRotation.z,  glm::vec3(0, 0, 1));
-        transform = glm::scale(transform, static_cast<glm::vec3>(_scaling) * std::powf(10.0, static_cast<float>(_scalingExponent)));
+        transform = glm::scale(transform, static_cast<glm::vec3>(_scaling) * std::pow(10.0f, static_cast<float>(_scalingExponent)));
         
         _raycaster->setColor(_color);
         _raycaster->setStepSize(_stepSize);
diff --git a/shaders/abuffer/resolveabuffer.frag b/shaders/abuffer/resolveabuffer.frag
index 4d4ff5f142..bda831088c 100644
--- a/shaders/abuffer/resolveabuffer.frag
+++ b/shaders/abuffer/resolveabuffer.frag
@@ -27,7 +27,7 @@
 #include "abufferfragment.glsl"
 #include "abufferresources.glsl"
 #include "fragment.glsl"
-#include "PowerScaling/PowerScalingMath.hglsl"
+#include "PowerScaling/powerScalingMath.hglsl"
 #include "blending.glsl"
 #include "rand.glsl"
 
diff --git a/src/network/parallelconnection.cpp b/src/network/parallelconnection.cpp
index f54ff5dbf1..11c5c2b4a2 100644
--- a/src/network/parallelconnection.cpp
+++ b/src/network/parallelconnection.cpp
@@ -27,9 +27,7 @@
 #define _ERRNO WSAGetLastError()
 #endif
 #else //Use BSD sockets
-#ifdef _XCODE
 #include <unistd.h>
-#endif
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
diff --git a/src/rendering/abufferrenderer.cpp b/src/rendering/abufferrenderer.cpp
index e0f4783ec5..84c7d16840 100644
--- a/src/rendering/abufferrenderer.cpp
+++ b/src/rendering/abufferrenderer.cpp
@@ -352,7 +352,7 @@ void ABufferRenderer::updateResolveDictionary() {
     dict.setValue("helperPaths", helperPathsDict);
     dict.setValue("rendererData", _rendererData);
     dict.setValue("raycastingEnabled", _raycastData.size() > 0);
-    dict.setValue("nRaycasters", _raycastData.size());
+    dict.setValue("nRaycasters", static_cast<unsigned long long>(_raycastData.size()));
 
     _resolveDictionary = dict;
     _dirtyResolveDictionary = false;