A few utils changes, mainly.