Michael please see PRs #515 and #516 two trivial tweaks that came out of the I3 work.

Steve