Minor improvements.

Change-Id: Iea6798a022ab9f1f0e27b6ca6c6b69da7543a5a8