Review fixes. Missed a few spots