Lots more config setup changes