Handle signals more gracefully and handle Gvc more gracefully