config handling fixes