Unit and academic year fix