fix xbmc patches
fix Confluence patch