Fixes to Config class