Fix all (?) species tree crashes