Fix a tool_* -> push_* bug