Better handling of stopxonotic/killxonotic