Minor fixes after uaa rebase