Fix up scheduler