More fixes of last silly bug.

Change-Id: I0e380693ab6cdcb9df87068ff97dfd6bd56b105b