Some more changes for XBMC addon compliancy.