Fixes to support external tools