Fix launch issues