Fixes from UAT and SAT
Merge branch 'master' of https://github.com/globeestate11/estate