improve signal handling support