More preliminary config changes