minor changes to utils and defs