More bugs exterminated.

Change-Id: I1ff7516a411c98a39304f0b9161cc24d9a8975f6