Fixes required for xbmc official