Fixing startup errors