Small fixes and xbmc-devel bump