Submitted by: mfosterw
A couple things came up during the last PR which were unrelated to its main purpose