Bugfixes

Reflecting changes introduced with the adoption of config.yaml.