derp fixes

Change-Id: I9c736dd783625857a7773dc9e490a48a00fb8f77