Add fixes to utils