Some build adjustments and minor req change