Clean up: Missed a couple, oops