Fixed more startup bugs