diff --git a/Extras/AlternativeCollisionAlgorithms/BoxBoxCollisionAlgorithm.cpp b/Extras/AlternativeCollisionAlgorithms/BoxBoxCollisionAlgorithm.cpp
index 907bbb62d..3e8d6c3ba 100644
--- a/Extras/AlternativeCollisionAlgorithms/BoxBoxCollisionAlgorithm.cpp
+++ b/Extras/AlternativeCollisionAlgorithms/BoxBoxCollisionAlgorithm.cpp
@@ -47,8 +47,8 @@ void BoxBoxCollisionAlgorithm::processCollision (btCollisionObject* body0,btColl
 
 	btCollisionObject*	col0 = body0;
 	btCollisionObject*	col1 = body1;
-	btBoxShape* box0 = (btBoxShape*)col0->m_collisionShape;
-	btBoxShape* box1 = (btBoxShape*)col1->m_collisionShape;
+	btBoxShape* box0 = (btBoxShape*)col0->getCollisionShape();
+	btBoxShape* box1 = (btBoxShape*)col1->getCollisionShape();
 
 
 
@@ -57,8 +57,8 @@ void BoxBoxCollisionAlgorithm::processCollision (btCollisionObject* body0,btColl
 	
 	btDiscreteCollisionDetectorInterface::ClosestPointInput input;
 	input.m_maximumDistanceSquared = 1e30f;
-	input.m_transformA = body0->m_worldTransform;
-	input.m_transformB = body1->m_worldTransform;
+	input.m_transformA = body0->getWorldTransform();
+	input.m_transformB = body1->getWorldTransform();
 
 	BoxBoxDetector detector(box0,box1);
 	detector.getClosestPoints(input,*resultOut,dispatchInfo.m_debugDraw);
diff --git a/Extras/AlternativeCollisionAlgorithms/BoxBoxDetector.cpp b/Extras/AlternativeCollisionAlgorithms/BoxBoxDetector.cpp
index f983e5fb6..6df7ad22c 100644
--- a/Extras/AlternativeCollisionAlgorithms/BoxBoxDetector.cpp
+++ b/Extras/AlternativeCollisionAlgorithms/BoxBoxDetector.cpp
@@ -243,7 +243,7 @@ void cullPoints2 (int n, btScalar p[], int m, int i0, int iret[])
       }
     }
 #ifndef dNODEBUG
-    ASSERT (*iret != i0);	// ensure iret got set
+    btAssert (*iret != i0);	// ensure iret got set
 #endif
     avail[*iret] = 0;
     iret++;
diff --git a/Extras/Jamfile b/Extras/Jamfile
index b6ee37e13..fd275916f 100644
--- a/Extras/Jamfile
+++ b/Extras/Jamfile
@@ -5,7 +5,10 @@ SubInclude TOP Extras COLLADA_DOM ;
 SubInclude TOP Extras LibXML ;
 #SubInclude TOP Extras EPA ;
 #SubInclude TOP Extras ExtraSolid35 ;
-#SubInclude TOP Extras quickstep ;
+SubInclude TOP Extras quickstep ;
+SubInclude TOP Extras AlternativeCollisionAlgorithms ;
 SubInclude TOP Extras GIMPACT ;
 SubInclude TOP Extras GIMPACTBullet ;
+
+#GPUphysics needs 'make', not jam compatible build yet:
 #SubInclude TOP Extras GPUphysics ;
diff --git a/Extras/quickstep/SorLcp.cpp b/Extras/quickstep/SorLcp.cpp
index 3c931b242..40f4088e5 100644
--- a/Extras/quickstep/SorLcp.cpp
+++ b/Extras/quickstep/SorLcp.cpp
@@ -78,8 +78,8 @@ typedef btScalar dMatrix3[4*3];
   (A)[1] op dDOT1((B+4),(C)); \
   (A)[2] op dDOT1((B+8),(C));
 
-#define dAASSERT ASSERT
-#define dIASSERT ASSERT
+#define dAASSERT btAssert
+#define dIASSERT btAssert
 
 #define REAL float
 #define dDOTpq(a,b,p,q) ((a)[0]*(b)[0] + (a)[p]*(b)[q] + (a)[2*(p)]*(b)[2*(q)])