diff --git a/include/utils/Image.h b/include/utils/Image.h
index ac06f087..5e8b45ad 100644
--- a/include/utils/Image.h
+++ b/include/utils/Image.h
@@ -17,8 +17,12 @@ public:
 	/// Default constructor for an image
 	///
 	Image() :
-		Image(1, 1)
+		_width(1),
+		_height(1),
+		_pixels(new Pixel_T[2]),
+		_endOfPixels(_pixels + 1)
 	{
+		memset(_pixels, 0, 2*sizeof(Pixel_T));
 	}
 
 	///
diff --git a/src/hyperiond/CMakeLists.txt b/src/hyperiond/CMakeLists.txt
index 17b7464f..f843b15f 100644
--- a/src/hyperiond/CMakeLists.txt
+++ b/src/hyperiond/CMakeLists.txt
@@ -9,9 +9,12 @@ target_link_libraries(hyperiond
 		jsonserver
 		protoserver
 		boblightserver
-		v4l2-grabber
 )
 
 if (ENABLE_DISPMANX)
 	target_link_libraries(hyperiond dispmanx-grabber)
 endif (ENABLE_DISPMANX)
+
+if (ENABLE_V4L2)
+	target_link_libraries(hyperiond v4l2-grabber)
+endif (ENABLE_V4L2)