Fix more insidious whitespace
Fix warnings in util.c