missed a few things in the prior commit