Bug fixes for courses