Fixes to the config and conf files