Fixing startup issues