diff --git a/libraries/fbx/src/FBXReader_Mesh.cpp b/libraries/fbx/src/FBXReader_Mesh.cpp
index 13a2c697a0..e6d9321fb5 100644
--- a/libraries/fbx/src/FBXReader_Mesh.cpp
+++ b/libraries/fbx/src/FBXReader_Mesh.cpp
@@ -585,7 +585,7 @@ void FBXReader::buildModelMesh(FBXMesh& extractedMesh, const QString& url) {
 
     FBXMesh& fbxMesh = extractedMesh;
     graphics::MeshPointer mesh(new graphics::Mesh());
-    bool blendShapes = !fbxMesh.blendshapes.empty();
+   // bool blendShapes = !fbxMesh.blendshapes.empty();
     int numVerts = extractedMesh.vertices.size();
 
     // Grab the vertices in a buffer
@@ -619,7 +619,7 @@ void FBXReader::buildModelMesh(FBXMesh& extractedMesh, const QString& url) {
         qWarning() << "Unexpected tangents in " << url;
     }
     const auto normalsAndTangentsSize = normalsSize + tangentsSize;
-    const int normalsAndTangentsStride = 2 * sizeof(NormalType);
+   // const int normalsAndTangentsStride = 2 * sizeof(NormalType);
     const int colorsSize = fbxMesh.colors.size() * sizeof(ColorType);
     // Texture coordinates are stored in 2 half floats
     const int texCoordsSize = fbxMesh.texCoords.size() * sizeof(vec2h);
@@ -635,7 +635,7 @@ void FBXReader::buildModelMesh(FBXMesh& extractedMesh, const QString& url) {
 
     // Normals and tangents are interleaved
     const int normalsOffset = 0;
-    const int tangentsOffset = normalsOffset + sizeof(NormalType);
+ //   const int tangentsOffset = normalsOffset + sizeof(NormalType);
     const int totalNTSize = normalsOffset + normalsSize + tangentsSize;
     //const int colorsOffset = normalsOffset + normalsSize + tangentsSize;
 
diff --git a/libraries/graphics/src/graphics/Geometry.cpp b/libraries/graphics/src/graphics/Geometry.cpp
index 3f5f484b08..2fbe3708fd 100755
--- a/libraries/graphics/src/graphics/Geometry.cpp
+++ b/libraries/graphics/src/graphics/Geometry.cpp
@@ -36,7 +36,9 @@ void Mesh::setVertexFormatAndStream(const gpu::Stream::FormatPointer& vf, const
     _vertexFormat = vf;
     _vertexStream = (*vbs);
 
-    _vertexBuffer = BufferView(vbs->getBuffers()[0], vbs->getOffsets()[0], vbs->getBuffers()[0]->getSize(), vbs->getStrides()[0], gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::XYZ));
+    auto attrib = _vertexFormat->getAttribute(gpu::Stream::POSITION);
+    _vertexBuffer = BufferView(vbs->getBuffers()[attrib._channel], vbs->getOffsets()[attrib._channel], vbs->getBuffers()[attrib._channel]->getSize(),
+        (gpu::uint16) vbs->getStrides()[attrib._channel], attrib._element);
 }
 
 void Mesh::setVertexBuffer(const BufferView& buffer) {