a collection of fixes
This is a collection of fixes that I have been doing of the past few months and am just finally getting around to posting a merge request. It includes fixing ./jenkins-build
so that the Jenkins builds run again, including the tests.