diff --git a/Demos/CMakeLists.txt b/Demos/CMakeLists.txt
index e578a4b8b..cdf36bd9e 100644
--- a/Demos/CMakeLists.txt
+++ b/Demos/CMakeLists.txt
@@ -2,11 +2,11 @@ if (CMAKE_SIZEOF_VOID_P MATCHES "8")
 SUBDIRS( OpenGL AllBulletDemos  ConvexDecompositionDemo Benchmarks HelloWorld
 CcdPhysicsDemo ConstraintDemo SliderConstraintDemo GenericJointDemo
 RagdollDemo ForkLiftDemo BasicDemo BspDemo MovingConcaveDemo VehicleDemo
-ColladaDemo UserCollisionAlgorithm CharacterDemo SoftDemo TerrainDemo HeightFieldFluidDemo)
+ColladaDemo UserCollisionAlgorithm CharacterDemo SoftDemo HeightFieldFluidDemo)
 else (CMAKE_SIZEOF_VOID_P MATCHES "8")
 SUBDIRS( OpenGL AllBulletDemos ConvexDecompositionDemo Benchmarks HelloWorld
 MultiThreadedDemo CcdPhysicsDemo ConstraintDemo SliderConstraintDemo
 GenericJointDemo RagdollDemo ForkLiftDemo BasicDemo BspDemo MovingConcaveDemo
 VehicleDemo ColladaDemo UserCollisionAlgorithm CharacterDemo SoftDemo
-TerrainDemo HeightFieldFluidDemo)
+ HeightFieldFluidDemo)
 endif (CMAKE_SIZEOF_VOID_P MATCHES "8")
diff --git a/Demos/HeightFieldFluidDemo/BulletHfFluid/btHfFluid.cpp b/Demos/HeightFieldFluidDemo/BulletHfFluid/btHfFluid.cpp
index daebeab3b..092f0c16e 100644
--- a/Demos/HeightFieldFluidDemo/BulletHfFluid/btHfFluid.cpp
+++ b/Demos/HeightFieldFluidDemo/BulletHfFluid/btHfFluid.cpp
@@ -8,7 +8,7 @@
 #include "BulletCollision/CollisionDispatch/btManifoldResult.h"
 #include "BulletCollision/CollisionShapes/btTriangleShape.h"
 #include "BulletDynamics/Dynamics/btRigidBody.h"
-#include "Demos/OpenGL/GLDebugDrawer.h"
+#include "../../OpenGL/GLDebugDrawer.h"
 								
 btHfFluid::btHfFluid (btScalar gridCellWidth, int numNodesWidth, int numNodesLength)
 {
diff --git a/Extras/iff/CMakeLists.txt b/Extras/iff/CMakeLists.txt
index ddc476a93..17d798c42 100644
--- a/Extras/iff/CMakeLists.txt
+++ b/Extras/iff/CMakeLists.txt
@@ -8,4 +8,4 @@ iffr.cpp
 iffw.cpp
 )
 
-SUBDIRS( BulletIffConverter )
+#SUBDIRS( BulletIffConverter )