XBMC: Misc changes