post-uat fixes round1