Update config option and checks to match