More delete course bug fixes