UA fixes (in response to PTFM-4820)