v2.0 all-in-one fix batch.