Updates to signal handling

[#58587658]