Review fixes. r=k88hudson