Fixes for the config file handling