Course List Fixes