diff --git a/AMBuildScript b/AMBuildScript
index ba87423f..a481451f 100644
--- a/AMBuildScript
+++ b/AMBuildScript
@@ -171,6 +171,9 @@ class SMConfig(object):
         '-msse',
         '-m32',
       ]
+      cxx.cxxflags += [
+          '-std=c++11',
+      ]
 
       have_gcc = cxx.vendor == 'gcc'
       have_clang = cxx.vendor == 'clang'
@@ -188,6 +191,8 @@ class SMConfig(object):
         '-fno-threadsafe-statics',
         '-Wno-non-virtual-dtor',
         '-Wno-overloaded-virtual',
+        '-Wno-implicit-exception-spec-mismatch',
+        '-Wno-deprecated-register',
       ]
 
       if have_gcc:
diff --git a/knight/shared/KePlatform.h b/knight/shared/KePlatform.h
index a4a9f3cf..220a1bfc 100644
--- a/knight/shared/KePlatform.h
+++ b/knight/shared/KePlatform.h
@@ -16,7 +16,7 @@
 
 #define KE_PLATFORM_POSIX
 
-#if defined linux
+#if defined __linux__
 #define KE_PLATFORM_LINUX
 #elif defined __APPLE__
 #define KE_PLATFORM_APPLE
diff --git a/public/amtl/am-utility.h b/public/amtl/am-utility.h
index 55b182ac..474c0052 100644
--- a/public/amtl/am-utility.h
+++ b/public/amtl/am-utility.h
@@ -71,7 +71,7 @@ ReturnAndVoid(T &t)
 
 #if defined(KE_CXX11)
 # define KE_DELETE = delete
-# define KE_OVERRIDE = override
+# define KE_OVERRIDE override
 #else
 # define KE_DELETE
 # define KE_OVERRIDE