Missed a couple of changes in the last commit