Build fixes

Change-Id: I63d4526a7d179497e6c0ebbed62269df87a540cf