Fix some derps

Change-Id: If56caf482c23f25e5adf242b00147d3d0b91a2a4