Patches and Cleanup
Merge pull request #1 from FestusHagen/1.64_2.fh1

Patches and Cleanup