More Settings file fixes