This should probably be in ApplyConfig()?