Bugfixes in configureation