Small utility changes