LPS-35716 - Matt's misc changes

Matt,

You included these changes in with your LPS-35716 changes. We want these commits to go in, but is there a more appropriate ticket for these to belong to?

Byran