Minor fixes.

Change-Id: I708b53c5092b55c0d52470696c23930b0283a49b