Fixed some derps

Change-Id: I7e4fb3ef8d762f3fc09e4e207dd6543eecaa8f53