Fixes for XBMC.