Various changes toward 1.19 compatibility #10

Closed dthigpen closed 1 year ago