diff --git a/libraries/avatars/src/Recording.cpp b/libraries/avatars/src/Recording.cpp
index f84b803c5f..fb3ee2b5e7 100644
--- a/libraries/avatars/src/Recording.cpp
+++ b/libraries/avatars/src/Recording.cpp
@@ -228,7 +228,7 @@ void writeRecordingToFile(RecordingPointer recording, const QString& filename) {
             stream << numBlendshapes;
             mask.resize(mask.size() + numBlendshapes);
         }
-        for (int j = 0; j < numBlendshapes; ++j) {
+        for (quint32 j = 0; j < numBlendshapes; ++j) {
             if (i == 0 ||
                 frame._blendshapeCoefficients[j] != previousFrame._blendshapeCoefficients[j]) {
                 writeFloat(stream, frame.getBlendshapeCoefficients()[j], BLENDSHAPE_RADIX);
@@ -243,7 +243,7 @@ void writeRecordingToFile(RecordingPointer recording, const QString& filename) {
             stream << numJoints;
             mask.resize(mask.size() + numJoints);
         }
-        for (int j = 0; j < numJoints; ++j) {
+        for (quint32 j = 0; j < numJoints; ++j) {
             if (i == 0 ||
                 frame._jointRotations[j] != previousFrame._jointRotations[j]) {
                 writeQuat(stream, frame._jointRotations[j]);
@@ -547,7 +547,7 @@ RecordingPointer readRecordingFromFile(RecordingPointer recording, const QString
             stream >> numBlendshapes;
         }
         frame._blendshapeCoefficients.resize(numBlendshapes);
-        for (int j = 0; j < numBlendshapes; ++j) {
+        for (quint32 j = 0; j < numBlendshapes; ++j) {
             if (!mask[maskIndex++] || !readFloat(stream, frame._blendshapeCoefficients[j], BLENDSHAPE_RADIX)) {
                 frame._blendshapeCoefficients[j] = previousFrame._blendshapeCoefficients[j];
             }
@@ -557,7 +557,7 @@ RecordingPointer readRecordingFromFile(RecordingPointer recording, const QString
             stream >> numJoints;
         }
         frame._jointRotations.resize(numJoints);
-        for (int j = 0; j < numJoints; ++j) {
+        for (quint32 j = 0; j < numJoints; ++j) {
             if (!mask[maskIndex++] || !readQuat(stream, frame._jointRotations[j])) {
                 frame._jointRotations[j] = previousFrame._jointRotations[j];
             }
diff --git a/libraries/shared/src/ListShape.h b/libraries/shared/src/ListShape.h
index bd150c8246..6352ef3f07 100644
--- a/libraries/shared/src/ListShape.h
+++ b/libraries/shared/src/ListShape.h
@@ -56,7 +56,7 @@ public:
     void setShapes(QVector<ListShapeEntry>& shapes);
 
     // TODO: either implement this or remove ListShape altogether
-    bool findRayIntersection(const glm::vec3& rayStart, const glm::vec3& rayDirection, float& distance) const { return false; }
+    bool findRayIntersection(RayIntersectionInfo& intersection) const { return false; }
 
 protected:
     void clear();