Fixed bugs in launcher