Fixed timezones for scheduler

My previously submitted PR for timezone fix was only part of the story. This fixes the scheduler timing as well