Attached are patches that get them to build.