Fix issues found testing on earlier 2.6 systems
6 files changed