More review fixes. Thanks!