Fixed more startup errors