Fixed failing hunks and added preallocate.diff.