Transition bug fixes