Hotfixes around course listings of broken courses