round 3 fixes for adding to xbmc repo