Add missing patches from xapi-project