Fixes to the config file, and imports