Adjustments for Han 3.0.1