Minor changes to utils