Use proper Sponge events and fix builds.