Fixes for compatibility with XBMC repos