Ensure prod-level changes are in code-base

[kaitj]

This PR just adds in some of the changes that was found on the server but not in this code base.