fixed build issues

Change-Id: I493b80261f81dad336c91d03f99b0b45a5ca13e9