Tweaks to util classes.