Throw some stuff into the fire

Change-Id: I0255c4255097b00b1c520c676f252d5f625fc1a1