Various fixes to get the scheduler and manage window info working