Broke HeapFile in last commit, this fixes it