Fix academic year in some entities