Added new fixes for Launcher