Fixup Course Action State - review comments.
Fixup: CMS Server-side code - review comments.