Config file fixes