Minor improvements in UT