bug fixes

For course based designs.