Fixes for tooling.

5 files changed