diff --git a/common.gypi b/common.gypi
index 8e6919a10..ba2347090 100644
--- a/common.gypi
+++ b/common.gypi
@@ -11,10 +11,10 @@
       'GCC_WARN_PEDANTIC': 'YES',
       'GCC_WARN_UNINITIALIZED_AUTOS': 'YES_AGGRESSIVE'
     },
-    'cflags_cc': ['-std=c++11'],
+    'cflags_cc': ['-std=c++11', '-Wall', '-Wextra'],
     'configurations': {
       'Debug': {
-        'cflags': [ '-g', '-O0' ],
+        'cflags_cc': [ '-g', '-O1', '-fno-omit-frame-pointer','-fwrapv', '-fstack-protector-all', '-fno-common' ],
         'defines': [ 'DEBUG' ],
         'xcode_settings': {
           'GCC_OPTIMIZATION_LEVEL': '1',
@@ -25,7 +25,7 @@
         }
       },
       'Release': {
-        'cflags': [ '-O3' ],
+        'cflags_cc': [ '-O3' ],
         'defines': [ 'NDEBUG' ],
         'xcode_settings': {
           'GCC_OPTIMIZATION_LEVEL': '3',
diff --git a/ios/MVKMapKit b/ios/MVKMapKit
index 5821b22b4..9c3aa2d91 160000
--- a/ios/MVKMapKit
+++ b/ios/MVKMapKit
@@ -1 +1 @@
-Subproject commit 5821b22b47c475562dc474cb75a28ac7320a1c95
+Subproject commit 9c3aa2d919f2a76d5fef2500a3ee624b57a11383