Merge pull request #439 from TheBlueMatt/2020-01-398-fixups