More changes to utils