fix compile errors attempt #002

Change-Id: I9a51f182edde4e42a482e4db37c9dd250f5bc03e