diff --git a/Demos/BasicDemo/BasicDemo.cpp b/Demos/BasicDemo/BasicDemo.cpp
index 92b6da122..0673e0636 100644
--- a/Demos/BasicDemo/BasicDemo.cpp
+++ b/Demos/BasicDemo/BasicDemo.cpp
@@ -164,14 +164,15 @@ void	BasicDemo::initPhysics()
 		trans.setIdentity();
 		//stack them
 		int colsize = 2;
-		int row = (i*HALF_EXTENTS*2)/(colsize*2*HALF_EXTENTS);
+		int row = (int)((i*HALF_EXTENTS*2)/(colsize*2*HALF_EXTENTS));
 		int row2 = row;
 		int col = (i)%(colsize)-colsize/2;
 		btVector3 pos(col*2*HALF_EXTENTS + (row2%2)*HALF_EXTENTS,
 			row*2*HALF_EXTENTS+HALF_EXTENTS,0);
 
 		trans.setOrigin(pos);
-		btRigidBody* body = localCreateRigidBody(1.f,trans,sphereShape);
+		//btRigidBody* body = localCreateRigidBody(1.f,trans,sphereShape);
+		localCreateRigidBody(1.f,trans,sphereShape);
 	}
 
 	clientResetScene();
@@ -194,9 +195,9 @@ void	BasicDemo::exitPhysics()
 	}
 
 	//delete collision shapes
-	for (i=0;i<m_collisionShapes.size();i++)
+	for (unsigned int j=0;j<m_collisionShapes.size();j++)
 	{
-		btCollisionShape* shape = m_collisionShapes[i];
+		btCollisionShape* shape = m_collisionShapes[j];
 		delete shape;
 	}
 
diff --git a/Demos/BspDemo/BspDemo.cpp b/Demos/BspDemo/BspDemo.cpp
index 014eb9849..e40cdcd2d 100644
--- a/Demos/BspDemo/BspDemo.cpp
+++ b/Demos/BspDemo/BspDemo.cpp
@@ -63,7 +63,6 @@ public:
 			
 			if (vertices.size() > 0)
 			{
-				bool isDynamic = false;
 				float mass = 0.f;
 				btTransform startTransform;
 				//can use a shift
@@ -72,7 +71,8 @@ public:
 				//this create an internal copy of the vertices
 				btCollisionShape* shape = new btConvexHullShape(&(vertices[0].getX()),vertices.size());
 
-				btRigidBody* body = m_demoApp->localCreateRigidBody(mass, startTransform,shape);
+				//btRigidBody* body = m_demoApp->localCreateRigidBody(mass, startTransform,shape);
+				m_demoApp->localCreateRigidBody(mass, startTransform,shape);
 			}
 		}
 };
diff --git a/Demos/ConcaveDemo/ConcavePhysicsDemo.cpp b/Demos/ConcaveDemo/ConcavePhysicsDemo.cpp
index fcd3e496f..d8e13758c 100644
--- a/Demos/ConcaveDemo/ConcavePhysicsDemo.cpp
+++ b/Demos/ConcaveDemo/ConcavePhysicsDemo.cpp
@@ -153,7 +153,6 @@ void	ConcaveDemo::initPhysics()
 
 	m_dynamicsWorld = new btDiscreteDynamicsWorld();
 	
-	bool isDynamic = false;
 	float mass = 0.f;
 	btTransform	startTransform;
 	startTransform.setIdentity();
diff --git a/Demos/ConvexDecompositionDemo/ConvexDecompositionDemo.cpp b/Demos/ConvexDecompositionDemo/ConvexDecompositionDemo.cpp
index e203f1d49..00c878d35 100644
--- a/Demos/ConvexDecompositionDemo/ConvexDecompositionDemo.cpp
+++ b/Demos/ConvexDecompositionDemo/ConvexDecompositionDemo.cpp
@@ -186,13 +186,13 @@ void ConvexDecompositionDemo::initPhysics(const char* filename)
 						}
 					}
 
-					bool isDynamic = true;
 					float mass = 1.f;
 					btCollisionShape* convexShape = new btConvexTriangleMeshShape(trimesh);
 					btTransform trans;
 					trans.setIdentity();
 					trans.setOrigin(centroid);
-					btRigidBody* body = m_convexDemo->localCreateRigidBody( mass, trans,convexShape);
+					//btRigidBody* body = m_convexDemo->localCreateRigidBody( mass, trans,convexShape);
+					m_convexDemo->localCreateRigidBody( mass, trans,convexShape);
 					mBaseCount+=result.mHullVcount; // advance the 'base index' counter.
 
 
@@ -229,7 +229,6 @@ void ConvexDecompositionDemo::initPhysics(const char* filename)
 		}
 
 		btCollisionShape* convexShape = new btConvexTriangleMeshShape(trimesh);
-		bool isDynamic = true;
 		float mass = 1.f;
 		
 		btTransform startTransform;
diff --git a/Demos/UserCollisionAlgorithm/UserCollisionAlgorithm.cpp b/Demos/UserCollisionAlgorithm/UserCollisionAlgorithm.cpp
index 2f3af6f39..8a87fed98 100644
--- a/Demos/UserCollisionAlgorithm/UserCollisionAlgorithm.cpp
+++ b/Demos/UserCollisionAlgorithm/UserCollisionAlgorithm.cpp
@@ -75,7 +75,6 @@ void	UserCollisionAlgorithm::initPhysics()
 	const int NUM_VERTS_X = 50;
 	const int NUM_VERTS_Y = 50;
 	const int totalVerts = NUM_VERTS_X*NUM_VERTS_Y;
-	const int totalTriangles = 2*(NUM_VERTS_X-1)*(NUM_VERTS_Y-1);
 
 	btVector3*	gVertices = new btVector3[totalVerts];
 	
@@ -90,7 +89,6 @@ void	UserCollisionAlgorithm::initPhysics()
 
 	btTriangleMesh* trimesh = new btTriangleMesh();
 
-	int index=0;
 	for ( i=0;i<NUM_VERTS_X-1;i++)
 	{
 		for (int j=0;j<NUM_VERTS_Y-1;j++)
@@ -115,7 +113,6 @@ void	UserCollisionAlgorithm::initPhysics()
 
 	m_dynamicsWorld = new btDiscreteDynamicsWorld(dispatcher,broadphase);
 	
-		bool isDynamic = false;
 	float mass = 0.f;
 	btTransform	startTransform;
 	startTransform.setIdentity();
@@ -130,7 +127,8 @@ void	UserCollisionAlgorithm::initPhysics()
 		{
 			btCollisionShape* sphereShape = new btSphereShape(1);
 			startTransform.setOrigin(btVector3(1,2*i,1));
-			btRigidBody* body = localCreateRigidBody(1, startTransform,sphereShape);
+			//btRigidBody* body = localCreateRigidBody(1, startTransform,sphereShape);
+			localCreateRigidBody(1, startTransform,sphereShape);
 		}
 	}
 	
diff --git a/src/BulletDynamics/ConstraintSolver/btContactConstraint.cpp b/src/BulletDynamics/ConstraintSolver/btContactConstraint.cpp
index c8cdb5547..8d22689ec 100644
--- a/src/BulletDynamics/ConstraintSolver/btContactConstraint.cpp
+++ b/src/BulletDynamics/ConstraintSolver/btContactConstraint.cpp
@@ -397,4 +397,5 @@ float resolveSingleFrictionEmpty(
 	const btContactSolverInfo& solverInfo)
 {
 	return 0.f;
-};
\ No newline at end of file
+};
+
diff --git a/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp b/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
index e079e5167..e5ce5141b 100644
--- a/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
+++ b/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
@@ -778,4 +778,5 @@ void	btDiscreteDynamicsWorld::setConstraintSolver(btConstraintSolver* solver)
 	}
 	m_ownsConstraintSolver = false;
 	m_constraintSolver = solver;
-}
\ No newline at end of file
+}
+