uts fixes related to #53