Oops. Missed a couple bugs