diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 68e1bbc716..f12cd94578 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -2923,6 +2923,7 @@ void Application::updateShadowMap() {
     glTranslatef(translation.x, translation.y, translation.z);
     
     renderAvatars(true);
+    _particles.render();    
     
     glPopMatrix();
     
diff --git a/interface/src/avatar/Hand.cpp b/interface/src/avatar/Hand.cpp
index 7530096e9d..69a339ef06 100755
--- a/interface/src/avatar/Hand.cpp
+++ b/interface/src/avatar/Hand.cpp
@@ -377,7 +377,7 @@ void Hand::render( bool isMine) {
     }
 
     //  Render toy ball
-    if (isMine) {
+    if (isMine && _hasToyBall) {
         glPushMatrix();
         glColor3f(1, 0, 0);
         glTranslatef(_toyBallPosition.x, _toyBallPosition.y, _toyBallPosition.z);
diff --git a/libraries/octree/src/Octree.cpp b/libraries/octree/src/Octree.cpp
index b101ce1063..baac0792b0 100644
--- a/libraries/octree/src/Octree.cpp
+++ b/libraries/octree/src/Octree.cpp
@@ -894,7 +894,6 @@ int Octree::encodeTreeBitstreamRecursion(OctreeElement* node,
     unsigned char childrenExistInTreeBits = 0;
     unsigned char childrenExistInPacketBits = 0;
     unsigned char childrenColoredBits = 0;
-    const int BYTES_PER_COLOR = 3;
 
     // Make our local buffer large enough to handle writing at this level in case we need to.
     LevelDetails thisLevelKey = packetData->startLevel();
diff --git a/libraries/particles/src/Particle.h b/libraries/particles/src/Particle.h
index bfdcbdd338..0fed2c80f0 100644
--- a/libraries/particles/src/Particle.h
+++ b/libraries/particles/src/Particle.h
@@ -57,7 +57,7 @@ public:
 
     const glm::vec3& getPosition() const { return _position; }
     const rgbColor& getColor() const { return _color; }
-    xColor getColor() { return { _color[RED_INDEX], _color[GREEN_INDEX], _color[BLUE_INDEX] }; }
+    xColor getColor() { xColor color = { _color[RED_INDEX], _color[GREEN_INDEX], _color[BLUE_INDEX] }; return color; }
     float getRadius() const { return _radius; }
     const glm::vec3& getVelocity() const { return _velocity; }
     const glm::vec3& getGravity() const { return _gravity; }
@@ -144,4 +144,4 @@ private:
 };
 
 
-#endif /* defined(__hifi__Particle__) */
\ No newline at end of file
+#endif /* defined(__hifi__Particle__) */