Course Index Fixes