More sparkle fixes