Hardcore bug squashing