fix some util files