minor changes to config handling