Merge pull request #621 from TheBlueMatt/2020-05-592-nits