Fix a couple of auto-launch issues.