Changes to signal handling