UTI: Small fixes and improvements