More xbmc fixes