more config fixes. Fixes #356