Build fixes

Change-Id: If3d953e30ebee6fd369d954a6598b33b120ce715