Merge pull request #546 from TheBlueMatt/2020-03-519-nits