fixes from UAT