Add some changes I missed in my last commit.