Schedule-related bugfixes