Bugfixes for refactored configuration