More flat_file fixes