Schedule fixups