UC updates & training bug fix