More fixes for config initialization