Changes to config handling.