Fixes in util.