Last commit missed a few things