Fixed launcher issues