Config refactor fixes