Improved signal handling.