Admin academic year fixes