Transition fixes