Missed a few places in the refactor