Satya -Bug Fixes

UAT bugs