Apply additional patches (diffs were actually mostly whitespace)