Fix some launch issues.