Fix issues around the example custom tool.