codereview: fix a few bugs

Change-Id: Ifd9fda05e15c9e1e106ffd4e30e1dafe8423cdf4
1 file changed