Typos and stuff

Overrides https://github.com/xbmc/xbmc/pull/4054