Add back missing Utils (??)
Fixing compile errors