Fix utils methods