More file fixes