diff --git a/SConstruct b/SConstruct
index 923eaaa512..7de79a26b1 100644
--- a/SConstruct
+++ b/SConstruct
@@ -209,7 +209,7 @@ else:
     if env['shared_glew']:
         env['shared_glew'] = conf.CheckPKG('GLEW')
     if env['shared_png']:
-        env['shared_png'] = conf.CheckPKG('png')
+        env['shared_png'] = conf.CheckPKG('libpng')
     if env['shared_sdl']:
         env['shared_sdl'] = conf.CheckPKG('SDL')
     if env['shared_zlib']:
diff --git a/Source/Core/Common/Src/CDUtils.cpp b/Source/Core/Common/Src/CDUtils.cpp
index 7477568e0a..30dc8a27a3 100644
--- a/Source/Core/Common/Src/CDUtils.cpp
+++ b/Source/Core/Common/Src/CDUtils.cpp
@@ -149,16 +149,16 @@ static struct
 } checklist[] =
 	{
 #ifdef __linux__
-		{ "/dev/cdrom", 0, 0},
-		{ "/dev/dvd", 0, 0},
-		{ "/dev/hd%c",  'a', 'z' },
+		{ "/dev/cdrom", 0, 0 },
+		{ "/dev/dvd", 0, 0 },
+		{ "/dev/hd%c", 'a', 'z' },
 		{ "/dev/scd%d", 0, 27 },
-		{ "/dev/sr%d",  0, 27 },
+		{ "/dev/sr%d", 0, 27 },
 #else
 		{ "/dev/acd%d", 0, 27 },
 		{ "/dev/cd%d", 0, 27 },
 #endif
-		{ NULL }
+		{ NULL, 0, 0 }
 	};
 
 // Returns true if a device is a block or char device and not a symbolic link