Core pr 5

Lots of minor fixes to make the installation run better.
It's called variable in the contrib module (sslproxy), so to keep the naming the same...