More configuration bugfixes