Fix some Derps

Change-Id: Ib3725e6e56320fae5e9fe6c0fd1aed4af59da5a8