diff --git a/Demos/SoftDemo/SoftDemo.cpp b/Demos/SoftDemo/SoftDemo.cpp
index 5ea5df79d..79a3dd47b 100644
--- a/Demos/SoftDemo/SoftDemo.cpp
+++ b/Demos/SoftDemo/SoftDemo.cpp
@@ -947,7 +947,7 @@ static void	Init_Tetra(SoftDemo* pdemo)
 	pdemo->toggleIdle();
 }
 
-unsigned	current_demo=1;
+unsigned	current_demo=0;
 
 void	SoftDemo::clientResetScene()
 {
@@ -976,12 +976,12 @@ void	SoftDemo::clientResetScene()
 	/* Init		*/ 
 	void (*demofncs[])(SoftDemo*)=
 	{
+		Init_Cloth,
 		Init_Cutting1,
 #ifdef BT_SOFTBODY_USE_STL
 		Init_TetraBunny,
 		Init_TetraCube,
 #endif //BT_SOFTBODY_USE_STL
-		Init_Cloth,
 		Init_Pressure,
 		Init_Volume,
 		Init_Ropes,
diff --git a/Extras/BulletMultiThreaded/CMakeLists.txt b/Extras/BulletMultiThreaded/CMakeLists.txt
index 612c9ebb4..88eb9c8db 100644
--- a/Extras/BulletMultiThreaded/CMakeLists.txt
+++ b/Extras/BulletMultiThreaded/CMakeLists.txt
@@ -34,6 +34,10 @@ ADD_LIBRARY(LibBulletMultiThreaded
 		SpuNarrowPhaseCollisionTask/SpuContactResult.cpp
 		SpuNarrowPhaseCollisionTask/SpuContactResult.h
 		SpuNarrowPhaseCollisionTask/SpuMinkowskiPenetrationDepthSolver.cpp
+		SpuNarrowPhaseCollisionTask/SpuEpaPenetrationDepthSolver.cpp
+		SpuNarrowPhaseCollisionTask/SpuEpaPenetrationDepthSolver.h
+		SpuNarrowPhaseCollisionTask/SpuGjkEpa2.cpp
+		SpuNarrowPhaseCollisionTask/SpuGjkEpa2.h
 		SpuNarrowPhaseCollisionTask/SpuMinkowskiPenetrationDepthSolver.h
 		SpuNarrowPhaseCollisionTask/SpuConvexPenetrationDepthSolver.h
 		SpuNarrowPhaseCollisionTask/SpuPreferredPenetrationDirections.h
diff --git a/src/BulletCollision/BroadphaseCollision/btDbvt.h b/src/BulletCollision/BroadphaseCollision/btDbvt.h
index 335a1da7b..f60d79e5c 100644
--- a/src/BulletCollision/BroadphaseCollision/btDbvt.h
+++ b/src/BulletCollision/BroadphaseCollision/btDbvt.h
@@ -87,6 +87,9 @@ struct	btDbvt
 	/* ICollide	*/ 
 	struct	ICollide
 	{
+		virtual ~ICollide()
+		{
+		}
 		virtual void	Process(const Node*,const Node*)=0;
 		virtual void	Process(const Node*)=0;
 		virtual bool	Descent(const Node*)=0;
diff --git a/src/BulletCollision/CMakeLists.txt b/src/BulletCollision/CMakeLists.txt
index 1051756b3..c0a4b1ead 100644
--- a/src/BulletCollision/CMakeLists.txt
+++ b/src/BulletCollision/CMakeLists.txt
@@ -12,6 +12,10 @@ ADD_LIBRARY(LibBulletCollision
 				BroadphaseCollision/btCollisionAlgorithm.h
 				BroadphaseCollision/btDispatcher.cpp
 				BroadphaseCollision/btDispatcher.h
+				BroadphaseCollision/btDbvtBroadphase.cpp
+				BroadphaseCollision/btDbvtBroadphase.h
+				BroadphaseCollision/btDbvt.cpp
+				BroadphaseCollision/btDbvt.h
 				BroadphaseCollision/btMultiSapBroadphase.cpp
 				BroadphaseCollision/btMultiSapBroadphase.h
 				BroadphaseCollision/btOverlappingPairCache.cpp
diff --git a/src/BulletSoftBody/CMakeLists.txt b/src/BulletSoftBody/CMakeLists.txt
index 753ab5484..a725e10ff 100644
--- a/src/BulletSoftBody/CMakeLists.txt
+++ b/src/BulletSoftBody/CMakeLists.txt
@@ -8,10 +8,6 @@ ADD_LIBRARY(LibBulletSoftBody
 	btSoftBody.h
 	btSoftBodyHelpers.cpp
 	btSparseSDF.h
-	btDbvtBroadphase.cpp
-	btDbvtBroadphase.h
-	btDbvt.cpp  
-	btDbvt.h
 	btSoftBodyHelpers.h
 	btSoftBodyRigidBodyCollisionConfiguration.cpp
 	btSoftRigidCollisionAlgorithm.cpp
diff --git a/src/BulletSoftBody/btSoftBody.h b/src/BulletSoftBody/btSoftBody.h
index 21ec35aea..a6c7b3322 100644
--- a/src/BulletSoftBody/btSoftBody.h
+++ b/src/BulletSoftBody/btSoftBody.h
@@ -120,6 +120,7 @@ public:
 	/* ImplicitFn	*/ 
 	struct	ImplicitFn
 	{
+		virtual ~ImplicitFn() {}
 		virtual btScalar	Eval(const btVector3& x)=0;
 	};