Fixes for config