Some more updates to util functions