Fix a few derps

Change-Id: I0dbafad6f4802171eca55db2f614f667df3eba68