Fixes for BUilding.

Change-Id: I2b5c5fdc9236db29368572cb4360af6fe90391d7