More commits for util crate