fixes to academy