Fixed a few utils.