Fix stupid bugs.

Change-Id: I8dc39b35926c95386e9542a88089187f274149ba