Final adjustments for 1.0