Ongoing xbmc 12 support