Fix config handling