Bugfixes in launcher