Minor changes in utils