Better handling of utility buffers