diff --git a/doc/data.html b/doc/data.html
index 2b5bcb78b..5e2ed3841 100644
--- a/doc/data.html
+++ b/doc/data.html
@@ -47,6 +47,11 @@
 <li>Various 3d models, many in .3ds format at 3D Cafe.</li>
 <i><a href="http://www.3dcafe.com">http://www.3dcafe.com</a></i>
 
+<br>
+<br>
+<li>Various 3d models, a various formats.</li>
+<i><a href="http://www.3dmodelworld.com">http://www.3dmodelworld.com</a></i>
+
 <br>
 <br>
 <li>Various 3d models, many in .3ds format at 3D Rocket Fuel.</li>
diff --git a/include/osg/Math b/include/osg/Math
index 0b9eaa4fd..146d3d637 100644
--- a/include/osg/Math
+++ b/include/osg/Math
@@ -69,7 +69,8 @@
 
 #if (defined(WIN32) && !(defined(_MSC_VER) && (_MSC_VER >= 1300)) && !defined(__MINGW32__) ) || \
     defined (sun) || \
-    defined (__hpux__)
+    defined (__hpux__) || \
+    defined (__DARWIN_OSX__)
 
     #ifndef floorf
     #define floorf (float)floor
@@ -123,13 +124,14 @@ inline double RadiansToDegrees(double angle) { return angle*180.0/PI; }
     inline bool isNaN(float v) { return _isnan(v)!=0; }
     inline bool isNaN(double v) { return _isnan(v)!=0; }
 #else
-    # if defined(__DARWIN_OSX__)
-    inline bool isNaN(float v) { return __isnanf(v); }
-    inline bool isNaN(double v) { return __isnand(v); }
-    #else
+// coment out this special handling for OSX, no longer seems valid.
+//    # if defined(__DARWIN_OSX__)
+//    inline bool isNaN(float v) { return __isnanf(v); }
+//    inline bool isNaN(double v) { return __isnand(v); }
+//    #else
     inline bool isNaN(float v) { return isnan(v); }
     inline bool isNaN(double v) { return isnan(v); }
-    #endif
+//    #endif
 #endif
 
 
diff --git a/src/Demos/osgimpostor/osgimpostor.cpp b/src/Demos/osgimpostor/osgimpostor.cpp
index 8f0a58a6a..a73bd6315 100644
--- a/src/Demos/osgimpostor/osgimpostor.cpp
+++ b/src/Demos/osgimpostor/osgimpostor.cpp
@@ -158,7 +158,8 @@ void LayoutAsGrid()
 
 	// setup grid information
 	osg::Group ** groups = new osg::Group*[GridX * GridY];
-	for (int i = 0; i < GridX * GridY; i++)
+        int i;
+	for (i = 0; i < GridX * GridY; i++)
 		groups[i] = new osg::Group();
 
 	float xGridStart = bbox.xMin();
@@ -180,7 +181,7 @@ void LayoutAsGrid()
 	}
  
 	// add nodes to building root    
-	for (int i = 0; i < GridX * GridY; i++)
+	for (i = 0; i < GridX * GridY; i++)
 	{
 		osg::StateSet * stateset = new osg::StateSet();