fixes and changes for client issues raised in uat.