More tweaks.

Change-Id: I5ba9e993a6cf1f3771f28b46b884fb7ebf29c221