Made some changes that reflect new config rules.