Missed a few changes in the last commit