diff --git a/interface/src/ui/MetavoxelEditor.cpp b/interface/src/ui/MetavoxelEditor.cpp
index 0f5c8dd048..64cf12373d 100644
--- a/interface/src/ui/MetavoxelEditor.cpp
+++ b/interface/src/ui/MetavoxelEditor.cpp
@@ -1022,7 +1022,7 @@ void ImportHeightfieldTool::apply() {
         
         QByteArray color;
         if (buffer->getColor().isEmpty()) {
-            const char WHITE_VALUE = 0xFF;
+            const unsigned char WHITE_VALUE = 0xFF;
             color = QByteArray(height.size() * DataBlock::COLOR_BYTES, WHITE_VALUE);
         } else {
             color = buffer->getUnextendedColor();
diff --git a/libraries/audio/src/AudioSourceNoise.h b/libraries/audio/src/AudioSourceNoise.h
index 2262c695a9..fb83ac26aa 100644
--- a/libraries/audio/src/AudioSourceNoise.h
+++ b/libraries/audio/src/AudioSourceNoise.h
@@ -48,7 +48,7 @@ public:
         
         _runningSum = 0;
         _index = 0;
-        _indexMask = ((uint16_t)1 << _randomRows) - 1;
+        _indexMask = ((uint16_t)1 << _randomRows) - (uint16_t)1;
         _scale = 1.0f / ((_randomRows + 1) * (1 << (_randomBits - 1)));
     }