Fixes to UTs