Fix some deficiencies.

Change-Id: I525d48e7125629752d3e15ab6ccbfd23e8592fa2