Refs #2075: some fixes on scheduler states