Minor additions.

Change-Id: Ia6789b48121af58b75d121d5c5e33f55c6a89d74