Fixed some nav goals failing to cancel.