Adding a couple missed changes in #440