academy fixes