compile errors fix

Change-Id: Ia32e45ae0c24b5c41cc086456c57f7391b7c7b66