Teamed battle fixes.