Bug fixes with spoiler tags