Fixes for building.

Change-Id: If0e714f085511b6efce80a8a7c44d4c512e4c556