CLC-1644 Misc. code review fixes for My Academics WIP
https://jira.media.berkeley.edu/jira/browse/CLC-1644