Tweak things.

Change-Id: I60d0f426ce92f0856613c3c8d76b1975a97c5630