Fix go lint errors in util