Fix overaly build issues

Change-Id: I12b0a267b5bc38fae33158254b02590cc270eee7