Configuration bugfixes