Minor changes in utilities.