[UAA] more fixes