Fixed more startup issues.