diff --git a/Demos/SoftDemo/SoftDemo.h b/Demos/SoftDemo/SoftDemo.h
index af259d322..eace7bea2 100644
--- a/Demos/SoftDemo/SoftDemo.h
+++ b/Demos/SoftDemo/SoftDemo.h
@@ -148,7 +148,7 @@ public:\
 	static DemoApplication* Create()\
 	{\
 		SoftDemo* demo = new SoftDemo##a;\
-		extern unsigned int current_demo;\
+		extern int current_demo;\
 		current_demo=a;\
 		demo->myinit();\
 		demo->initPhysics();\
diff --git a/Demos/ThreadingDemo/main.cpp b/Demos/ThreadingDemo/main.cpp
index ac504ecd6..405a5f7ba 100644
--- a/Demos/ThreadingDemo/main.cpp
+++ b/Demos/ThreadingDemo/main.cpp
@@ -93,7 +93,7 @@ void	SampleThreadFunc(void* userPtr,void* lsMemory)
 		}
 		//do some fake work
 		for (int i=0;i<1000000;i++)
-			args->m_fakeWork = 1.21*args->m_fakeWork;
+			args->m_fakeWork = btScalar(1.21)*args->m_fakeWork;
 		workLeft = count>0;
 	}
 	printf("finished\n");
diff --git a/src/BulletSoftBody/btSoftBody.cpp b/src/BulletSoftBody/btSoftBody.cpp
index 6232ec5db..8fe34658e 100644
--- a/src/BulletSoftBody/btSoftBody.cpp
+++ b/src/BulletSoftBody/btSoftBody.cpp
@@ -514,7 +514,7 @@ void			btSoftBody::addAeroForceToNode(const btVector3& windVelocity,int nodeInde
 					{
 						btScalar del_v_by_fDrag_len = del_v_by_fDrag.length();
 						btScalar v_len = n.m_v.length();
-						fDrag *= 0.8*(v_len / del_v_by_fDrag_len);
+						fDrag *= btScalar(0.8)*(v_len / del_v_by_fDrag_len);
 					}
 
 					n.m_f += fDrag;
@@ -607,7 +607,7 @@ void			btSoftBody::addAeroForceToFace(const btVector3& windVelocity,int faceInde
 						{
 							btScalar del_v_by_fDrag_len = del_v_by_fDrag.length();
 							btScalar v_len = f.m_n[j]->m_v.length();
-							fDrag *= 0.8*(v_len / del_v_by_fDrag_len);
+							fDrag *= btScalar(0.8)*(v_len / del_v_by_fDrag_len);
 						}
 
 						f.m_n[j]->m_f += fDrag; 
@@ -857,8 +857,8 @@ void btSoftBody::setRestLengthScale(btScalar restLengthScale)
 	}
 	m_restLengthScale = restLengthScale;
 	
-	if (getActivationState() == ISLAND_SLEEPING);
-	activate();
+	if (getActivationState() == ISLAND_SLEEPING)
+		activate();
 }
 
 //
diff --git a/src/LinearMath/btVector3.cpp b/src/LinearMath/btVector3.cpp
index 260614c16..24bd521a9 100644
--- a/src/LinearMath/btVector3.cpp
+++ b/src/LinearMath/btVector3.cpp
@@ -315,7 +315,7 @@ long _maxdot_large( const float *vv, const float *vec, unsigned long count, floa
         index += localCount/4;
 #else
         {
-            for( int i=0; i<localCount/4; i++,index++)   
+            for( unsigned int i=0; i<localCount/4; i++,index++)   
             { // do four dot products at a time. Carefully avoid touching the w element.
                 float4 v0 = vertices[0];
                 float4 v1 = vertices[1];
@@ -702,7 +702,7 @@ long _mindot_large( const float *vv, const float *vec, unsigned long count, floa
         index += localCount/4;
 #else
         {
-            for( int i=0; i<localCount/4; i++,index++)   
+            for( unsigned int i=0; i<localCount/4; i++,index++)   
             { // do four dot products at a time. Carefully avoid touching the w element.
                 float4 v0 = vertices[0];
                 float4 v1 = vertices[1];