Fixes for the config loading