Minor additions.

Change-Id: Ifa03dbaf4d4ffbbd7420be57cebb6b2b43ead8af