Minor fixes.

Change-Id: Id6130f122b4fac68fdf4eae3a191f4595268e35d