Fix signal handling

- Signal handler should allow a more gentle stop now