Minor bugfixes to configuration