Improve signal handling.