Squashing more bugs