Adding some minor API changes to some of the tools.