Fixed bugs in launch