UAT 3 defect fixes.