Training School fixes