missed a couple changes after merge.