Added fixes to prevent unnecessary errors and not show ENVS 21 as a waived course