Fix more derps

Change-Id: Iddae087697cfb70bdb22cea6c207ab7ee22e32f0