Fix some derps

Change-Id: I7adfa35ff19daa24a51e2bcdf060c5594d02aa96
Signed-off-by: Lokesh Chamane <lokesh.c703@gmail.com>