ActiveAE: Fixes for gotham

Here are some fixes, that we need in gotham. These are the fixes out of: https://github.com/xbmc/xbmc/pull/4451

I will rebase the other one as soon those are in.