Fix the occasional spinning looking on startup