post uat fixes round 2