Fixing some signal handling bugs