Fix utils as well.