Data file fixes