Squash some signal bugs