A few fixes.

Change-Id: I5d0462f117011a7350292d49c50b513937c88a27