Minor file fixes