A few small fixes to docs and tools