Fixed launch issues