Fixed up launch bugs