More course assignment reset tweaks