Fixed DataFile memory leaks