More xbmc fixes.