Golden file fixes