diff --git a/src/nvimage/FloatImage.cpp b/src/nvimage/FloatImage.cpp
index 93de5aa..0fcea3c 100644
--- a/src/nvimage/FloatImage.cpp
+++ b/src/nvimage/FloatImage.cpp
@@ -423,7 +423,7 @@ FloatImage * FloatImage::fastDownSample() const
 	{
 		const uint n = w * h;
 		
-		if (n & 1)
+		if ((m_width * m_height) & 1)
 		{
 			const float scale = 1.0f / (2 * n + 1);
 			
diff --git a/src/nvimage/ImageIO.cpp b/src/nvimage/ImageIO.cpp
index 264c945..24ff439 100644
--- a/src/nvimage/ImageIO.cpp
+++ b/src/nvimage/ImageIO.cpp
@@ -62,9 +62,10 @@ namespace {
 	
 } // namespace
 
+#if defined(HAVE_FREEIMAGE)
 static Image * loadFreeImage(FREE_IMAGE_FORMAT fif, Stream & s);
 static FloatImage * loadFloatFreeImage(FREE_IMAGE_FORMAT fif, Stream & s);
-
+#endif
 
 Image * nv::ImageIO::load(const char * fileName)
 {