Cosmetic main loop fixes