Fix util methods.