Minor changes to session scheduling