Minor updates to the tooling.