Squashing moar bugs