diff --git a/AMBuildScript b/AMBuildScript
index fe78d2b..6644326 100644
--- a/AMBuildScript
+++ b/AMBuildScript
@@ -158,7 +158,7 @@ class ExtensionConfig(object):
       '-fvisibility=hidden',
     ]
     cxx.cxxflags += [
-      '-std=c++11',
+      '-std=c++14',
       '-fno-exceptions',
       '-fno-threadsafe-statics',
       '-Wno-non-virtual-dtor',
@@ -243,9 +243,9 @@ class ExtensionConfig(object):
     cxx.defines += ['_LINUX', 'POSIX']
     cxx.linkflags += ['-Wl,--exclude-libs,ALL', '-lm']
     if cxx.vendor == 'gcc':
-      cxx.linkflags += ['-static-libgcc']
+      cxx.linkflags += ['-static-libstdc++']
     elif cxx.vendor == 'clang':
-      cxx.linkflags += ['-lgcc_eh']
+      cxx.linkflags += ['-static-libstdc++']
 
   def configure_mac(self, cxx):
     cxx.defines += ['OSX', '_OSX', 'POSIX']
diff --git a/extension.cpp b/extension.cpp
index 24d1ae6..ce2323b 100644
--- a/extension.cpp
+++ b/extension.cpp
@@ -205,11 +205,15 @@ const char *CSteamID::Render() const
 class CSteam3Server
 {
 public:
+	void *m_pSteamClient;
 	ISteamGameServer *m_pSteamGameServer;
 	void *m_pSteamGameServerUtils;
 	void *m_pSteamGameServerNetworking;
 	void *m_pSteamGameServerStats;
 	void *m_pSteamHTTP;
+	void *m_pSteamInventory;
+	void *m_pSteamUGC;
+	void *m_pSteamApps;
 } *g_pSteam3Server;
 
 CBaseServer *g_pBaseServer = NULL;