Moved things to the main thread that should have been there from the beginning