Small tweaks per UAT