config fixes

I can't push these directly since I can't push the required go-jsonw changes, so making a pull request instead.