Extra patches for the EVMS 2.0.1 release.