Various changes to core utilities