fix compile errors attempt #001

Change-Id: Iacbda1d2a01ee338f470eb1420f159de5d827589