missed a couple moves in a previous commit