Fixes

Fixes for config errors