Fixed the patches, so they will build.

--