Fixes in building.