Add tools patches