Squashing some more bugs