Fixed enrollment bugs and schedule bugs