minor fixes and UT (apparently) fixed