fixes to *_util.c files