diff --git a/Alc/alsa.c b/Alc/alsa.c
index f59ebb84..48f7a358 100644
--- a/Alc/alsa.c
+++ b/Alc/alsa.c
@@ -444,7 +444,7 @@ static ALCboolean alsa_open_capture(ALCdevice *pDevice, const ALCchar *deviceNam
                strcmp(deviceName, alsaCaptureDeviceList[idx]) == 0)
             {
                 if(idx > 0)
-                    sprintf(driver, "hw:%d,0", idx-1);
+                    sprintf(driver, "hw:%zd,0", idx-1);
                 goto open_alsa;
             }
         }
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b5721a0e..fc8e2c5b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -51,15 +51,16 @@ SET(EXTRA_LIBS m ${EXTRA_LIBS})
 IF("${MSVC}")
     # ???
 ELSE()
-    CHECK_C_COMPILER_FLAG(-W HAVE_W_SWITCH)
-    IF("${HAVE_W_SWITCH}")
-        ADD_DEFINITIONS(-W)
+    ADD_DEFINITIONS(-Wall)
+    CHECK_C_COMPILER_FLAG(-Wextra HAVE_W_EXTRA)
+    IF("${HAVE_W_EXTRA}")
+        ADD_DEFINITIONS(-Wextra)
     ENDIF()
 
-    ADD_DEFINITIONS(-Wall)
     IF(WERROR)
         ADD_DEFINITIONS(-Werror)
     ENDIF()
+
     IF(DEBUG)
         ADD_DEFINITIONS(-g3)
     ELSEIF(NODEBUG)