patches to fix patch_xmb errors