Fixing Course constructors