Fixing startup bugs