assorted 3.37 cleanups

Marinus Schraal requested to merge wip/mschraal/assorted-cleanups into master Mar 26, 2020