Fixed enrollment bugs