diff --git a/src/ui/inputevents.d b/src/ui/inputevents.d
index 4a4cafb..5efffe8 100644
--- a/src/ui/inputevents.d
+++ b/src/ui/inputevents.d
@@ -79,7 +79,7 @@ static this()
     }
 }
 
-Input input;
+__gshared Input input;
 
 private:
 
diff --git a/src/ui/sound.d b/src/ui/sound.d
index 71f69e7..3769f7e 100644
--- a/src/ui/sound.d
+++ b/src/ui/sound.d
@@ -38,7 +38,6 @@ static import host;
 static this()
 {
     soundCard = new SoundCardNo();
-/+  TODO: fix sound segfault in fillAudio
     if (host.SDL)
     {
         if (SDL_InitSubSystem(SDL_INIT_AUDIO) == -1)
@@ -50,7 +49,6 @@ static this()
         if (checkCard.isActive)
             soundCard = checkCard;
     }
-+/
     host.delay.soundCardActive = &soundCard.getIsActive;
     host.delay.soundCardHasEnoughData = &soundCard.hasEnoughData;
 }