Added correct signal handlers