Fixes to support config files