Minor fixes for building.