Fix some deficiencies.

Change-Id: Iaa93e33a962a753bf98a60e30a155746d3098536