First round of config updates.