config handling improvements