[util] Bug Fixes for util files