Configuration bugfixes.