Fix build errors

Change-Id: I78deed7b5e3565a533fe107e34bd38243b88e1d2
I wanna be fully shit

Change-Id: I7be3839cdfd426ebb97eab2ec5d10d10f1edfcf2