Missed a couple things in my previous commit.