Adjustments to the 4.0.1 build