xbmc 12 fixes

See commit log