Minor modifications.

Change-Id: I9498abf76836c171b1e62673df5114d8dbbe1106