Review fixes. r=humphd