Some xbmc fixes.