squashing more bugs