Fixing some of the config nonsense