Various small improvements for tools/