Cleaned up some event loop inconsistencies