Added some extra functionality to some utilities.