Minor fixes due to Launcher testing.