various bug fixes I found while upgrading our systems #125

Closed unixfreak0037 closed 5 years ago