Transition & invulnerability fix