Better signal handling