Scheduler and Governor config changes