Minor build adjustments.