Fixes to tooling