More Utils and bug fixes