Fix up signal handling