more config handling fixes