Merge branch '2020-06-23-misc-minor-fixes'