Various tweaks to utilities to build cleanly on my system