diff --git a/libraries/entities/src/ModelEntityItem.cpp b/libraries/entities/src/ModelEntityItem.cpp
index 7c14d8a4a0..b1edd47a67 100644
--- a/libraries/entities/src/ModelEntityItem.cpp
+++ b/libraries/entities/src/ModelEntityItem.cpp
@@ -619,7 +619,6 @@ void ModelEntityItem::setColor(const rgbColor& value) {
     });
 }
 
-#pragma optimize("", off)
 void ModelEntityItem::setColor(const xColor& value) {
     withWriteLock([&] {
         _color[RED_INDEX] = value.red;
diff --git a/libraries/graphics/src/graphics/Light.cpp b/libraries/graphics/src/graphics/Light.cpp
index 50601299dd..76d8a6030a 100755
--- a/libraries/graphics/src/graphics/Light.cpp
+++ b/libraries/graphics/src/graphics/Light.cpp
@@ -69,7 +69,7 @@ void Light::setCastShadows(const bool castShadows) {
     _castShadows = castShadows;
 }
 
-const bool Light::getCastShadows() const {
+bool Light::getCastShadows() const {
     return _castShadows;
 }
 
diff --git a/libraries/graphics/src/graphics/Light.h b/libraries/graphics/src/graphics/Light.h
index ebe22d5593..bb9fb3e5b9 100755
--- a/libraries/graphics/src/graphics/Light.h
+++ b/libraries/graphics/src/graphics/Light.h
@@ -104,7 +104,7 @@ public:
     const Vec3& getDirection() const;
 
     void setCastShadows(const bool castShadows);
-    const bool getCastShadows() const;
+    bool getCastShadows() const;
 
     void setOrientation(const Quat& orientation);
     const glm::quat& getOrientation() const { return _transform.getRotation(); }