Minor behavior changes in main loop