More config file fixes