diff --git a/Globals.cpp b/Globals.cpp
index 8c509f92..40fb13a6 100644
--- a/Globals.cpp
+++ b/Globals.cpp
@@ -1473,6 +1473,7 @@ global_settings::export_as_text( std::ostream &Output ) const {
     export_as_text( Output, "python.threadedupload", python_threadedupload );
     export_as_text( Output, "python.uploadmain", python_uploadmain );
     export_as_text( Output, "python.mipmaps", python_mipmaps );
+    export_as_text( Output, "async.trainThreads", trainThreads );
     for( auto const &server : network_servers ) {
         Output
             << "network.server "
diff --git a/application.cpp b/application.cpp
index 83d2f463..2ef1f331 100644
--- a/application.cpp
+++ b/application.cpp
@@ -741,12 +741,14 @@ eu07_application::on_key( int const Key, int const Scancode, int const Action, i
 
     if( m_modestack.empty() ) { return; }
 
+    #ifdef __unix__
 	if (Key == GLFW_KEY_LEFT_SHIFT || Key == GLFW_KEY_RIGHT_SHIFT)
 		Global.shiftState = Action == GLFW_PRESS;
 	if (Key == GLFW_KEY_LEFT_CONTROL || Key == GLFW_KEY_RIGHT_CONTROL)
 		Global.ctrlState = Action == GLFW_PRESS;
 	if (Key == GLFW_KEY_LEFT_ALT || Key == GLFW_KEY_RIGHT_ALT)
 		Global.altState = Action == GLFW_PRESS;
+    #endif
 
     m_modes[ m_modestack.top() ]->on_key( Key, Scancode, Action, Mods );
 }
diff --git a/drivermode.cpp b/drivermode.cpp
index 6fd9b490..248638e6 100644
--- a/drivermode.cpp
+++ b/drivermode.cpp
@@ -432,6 +432,12 @@ driver_mode::exit() {
 void
 driver_mode::on_key( int const Key, int const Scancode, int const Action, int const Mods ) {
 
+    #ifndef __unix__
+    Global.shiftState = (Mods & GLFW_MOD_SHIFT) ? true : false;
+	Global.ctrlState = (Mods & GLFW_MOD_CONTROL) ? true : false;
+	Global.altState = (Mods & GLFW_MOD_ALT) ? true : false;
+    #endif
+
     bool anyModifier = Mods & (GLFW_MOD_SHIFT | GLFW_MOD_CONTROL | GLFW_MOD_ALT);
 
     // give the ui first shot at the input processing...
diff --git a/editormode.cpp b/editormode.cpp
index c743957c..af2c25cc 100644
--- a/editormode.cpp
+++ b/editormode.cpp
@@ -154,7 +154,11 @@ editor_mode::exit() {
 
 void
 editor_mode::on_key( int const Key, int const Scancode, int const Action, int const Mods ) {
-
+#ifndef __unix__
+	Global.shiftState = (Mods & GLFW_MOD_SHIFT) ? true : false;
+	Global.ctrlState = (Mods & GLFW_MOD_CONTROL) ? true : false;
+	Global.altState = (Mods & GLFW_MOD_ALT) ? true : false;
+#endif
     bool anyModifier = Mods & (GLFW_MOD_SHIFT | GLFW_MOD_CONTROL | GLFW_MOD_ALT);
 
     // give the ui first shot at the input processing...
diff --git a/launcher/launchermode.cpp b/launcher/launchermode.cpp
index 3e5df2a9..2de55215 100644
--- a/launcher/launchermode.cpp
+++ b/launcher/launchermode.cpp
@@ -34,6 +34,11 @@ void launcher_mode::exit()
 
 void launcher_mode::on_key(const int Key, const int Scancode, const int Action, const int Mods)
 {
+#ifndef __unix__
+	Global.shiftState = (Mods & GLFW_MOD_SHIFT) ? true : false;
+	Global.ctrlState = (Mods & GLFW_MOD_CONTROL) ? true : false;
+	Global.altState = (Mods & GLFW_MOD_ALT) ? true : false;
+#endif
 	m_userinterface->on_key(Key, Action);
 }