Port over some fixes from DFM that I ran into
Port over temp fixes for multisite
Merge pull request #1 from danielbachhuber/config-fixes

Configuration fixes for multisite