Add back Util function and fix strings