Resolved bugs identified in UAT