UAT Fixes Tranche #1