Get things ready for the real 3.0.