Missed a couple things in last commit