Minor fixup in utility scripts