Fixed the tools. They are now more in sync with branch_v2plus