Better spoiler handling