Some fixes for the new course