Fixups for academic year issues.