DataBuffer leak fixes (in theory)