Cosmetic changes on the scheduler