fixed some bugs in uaa