Some fixed for xbmc