More fixes to building requirements.