More fixes for the transition.