diff --git a/Demos/HeightFieldFluidDemo/HfFluidDemo.cpp b/Demos/HeightFieldFluidDemo/HfFluidDemo.cpp
index 723a6b5a4..0867b655f 100644
--- a/Demos/HeightFieldFluidDemo/HfFluidDemo.cpp
+++ b/Demos/HeightFieldFluidDemo/HfFluidDemo.cpp
@@ -168,7 +168,7 @@ void Init_Bowl (HfFluidDemo* fluidDemo)
 		{
 			btScalar y = btScalar(j - fluid->getNumNodesLength()/2)/btScalar(fluid->getNumNodesLength()*2);
 			btScalar yh = amplitude * (y * y) + btScalar(5.0);
-			btScalar gHeight = max(xh,yh);
+			btScalar gHeight = btMax(xh,yh);
 			int index = fluid->arrayIndex (i, j);
 			ground[index] = gHeight;
 			btScalar wHeight = btScalar(0.0f);
diff --git a/Demos/HeightFieldFluidDemo/Jamfile b/Demos/HeightFieldFluidDemo/Jamfile
index 02f4e200a..da5763bdc 100644
--- a/Demos/HeightFieldFluidDemo/Jamfile
+++ b/Demos/HeightFieldFluidDemo/Jamfile
@@ -1,3 +1,5 @@
 SubDir TOP Demos HeightFieldFluidDemo ;
 
-BulletDemo HeightFieldFluidDemo : [ Wildcard *.h *.cpp BulletHfFluid/*.h BulletHfFluid/*.cpp ] ;
+BulletDemo HeightFieldFluidDemo : [ Wildcard *.cpp *.h ] 
+[ Wildcard BulletHfFluid : *.h *.cpp ]
+;
diff --git a/Extras/MayaPlugin/Makefile.mac b/Extras/MayaPlugin/Makefile.mac
index bd360949a..440be2b25 100644
--- a/Extras/MayaPlugin/Makefile.mac
+++ b/Extras/MayaPlugin/Makefile.mac
@@ -28,9 +28,9 @@ CPPFLAGS = -DMAC_PLUGIN -DOSMac_MachO_ -DBits32_ -m32 -DUNIX -D_BOOL -DOSMac_ -D
 
 LDFLAGS =-bundle -ldl -shared
 
-BULLET_INCLUDE=-I$(BULLET)/src -I$(BULLET)/Extras/GIMPACT/include
+BULLET_INCLUDE=-I$(BULLET)/src 
 BULLET_LIB=-L$(BULLET)/out/macosxx86/optimize/libs -L$(BULLET)/src \
-                -lBulletColladaConverter -lcolladadom -llibxml  -lGIMPACT -lGIMPACTUtils -lbulletdynamics \
+                -lBulletColladaConverter -lcolladadom -llibxml  -lGIMPACTUtils -lbulletdynamics \
                  -lbulletcollision -lbulletmath 
 
 GL_LIB=-framework OpenGL
@@ -40,7 +40,7 @@ MAYA_LIB=-L/Applications/Autodesk/maya2008/Maya.app/Contents/MacOS -lOpenMaya -l
 
 SOURCES = pluginMain.cpp colladaExport.cpp rigidBodyNode.cpp rigidBodyArrayNode.cpp collisionShapeNode.cpp \
 	  solver.cpp bt_solver.cpp dSolverNode.cpp dSolverCmd.cpp dRigidBodyCmd.cpp dRigidBodyArrayCmd.cpp \
-	  pdbIO.cpp drawUtils.cpp
+	  pdbIO.cpp drawUtils.cpp nailConstraintNode.cpp dNailConstraintCmd.cpp
 
 HEADERS = box_shape.h             bt_sphere_shape.h         dSolverNode.h         rigid_body_impl.h \
 	box_shape_impl.h        collision_shape.h         mathUtils.h           rigidBodyNode.h \
@@ -51,7 +51,7 @@ HEADERS = box_shape.h             bt_sphere_shape.h         dSolverNode.h
 	bt_plane_shape.h        dRigidBodyArrayCmd.h      plane_shape_impl.h \
 	bt_rigid_body.h         dRigidBodyCmd.h           rigidBodyArrayNode.h \
 	bt_solver.h             dSolverCmd.h              rigid_body.h 		pdbIO.h \
-	shared_ptr.h		drawUtils.h
+	shared_ptr.h		drawUtils.h		nailConstraintNode.h
 
 
 INCLUDE_FLAGS= $(GL_INCLUDE) $(BULLET_INCLUDE) $(MAYA_INCLUDE)
diff --git a/Extras/iff/Jamfile b/Extras/iff/Jamfile
index 1157e4970..1ba328bb2 100644
--- a/Extras/iff/Jamfile
+++ b/Extras/iff/Jamfile
@@ -29,4 +29,4 @@ InstallHeader [ Wildcard *.h ] : iff ;
 
 SubInclude TOP Extras iff iffCheck ;
 SubInclude TOP Extras iff iffCreateTest ;
-SubInclude TOP Extras iff BulletIffConverter ;
+#SubInclude TOP Extras iff BulletIffConverter ;
diff --git a/config.h.in b/config.h.in
index 2f10be9b4..6c30c429a 100644
--- a/config.h.in
+++ b/config.h.in
@@ -60,10 +60,6 @@
 /* Define to 1 if you have the <windows.h> header file. */
 #undef HAVE_WINDOWS_H
 
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
-#undef LT_OBJDIR
-
 /* Name of package */
 #undef PACKAGE