build fixes

Change-Id: I7ac3f44db785b80543ea60c09eca5e93adb4d7ef