Merge pull request #558 from TheBlueMatt/2020-03-555-nits