Missed a few things on rewrite