Minor improvements.

Change-Id: I688a671dc4d70859be3d8df621c5ccec6297fdaf