Transition unit fixes