More fixes to config