Launcher fixes for windows