match XBMC changes