Some fixes to the show scheduler