Satya - bug fixes

foreign address and UAT bugs