Fix bad heads

Change-Id: I2b6caf3a202ea8d311eb5116b003723dfb3ff58d