A few more fixes to XBMC / Kodi booting