Build fixes

Change-Id: I6b99a0b250055e72b8572d27cca69dcc28674277