Missed a couple of methods in last commit