Squashing more bugs, I hope.