Some minor fixes from Eve 2.X. Sadly the proxy change doesn't work in Eve 3.0, we need to get something done for 3.0.1 to get the required behaviour.