diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el
index a36f0fef14a..7a073d0b20b 100644
--- a/lisp/vc/vc-hg.el
+++ b/lisp/vc/vc-hg.el
@@ -2000,9 +2000,9 @@ The return value is always a string."
   "Return `topic' or nil for BRANCH or the currently active bookmark.
 If BRANCH names a bookmark, or BRANCH is nil but there is a currently
 active bookmark, return `topic'.  Otherwise return nil."
-  (if branch
-      (member branch (vc-hg--bookmarks))
-    (and (assq 'bookmark (vc-hg--working-branch)) 'topic)))
+  (and (if branch (member branch (vc-hg--bookmarks))
+         (assq 'bookmark (vc-hg--working-branch)))
+       'topic))
 
 (defun vc-hg-topic-outgoing-base ()
   "Return outgoing base for current commit considered as a topic branch.
@@ -2013,7 +2013,7 @@ This is based on the following assumptions:
 (i) if there is an active bookmark, it will eventually be merged into
     whatever the remote head is
 (ii) there is only one remote head for the current branch."
-  (assq 'branch (vc-hg--working-branch)))
+  (cdr (assq 'branch (vc-hg--working-branch))))
 
 (provide 'vc-hg)
 
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index 0aaf7d36dfa..8edbb4ffe23 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -9082,7 +9082,7 @@ process sentinels.  They shall not disturb each other."
      (string-equal (tramp--test-operation tramp-test-vec)
 		   (tramp--handle-test-operation tramp-test-vec)))
     (let ((vec (copy-tramp-file-name tramp-test-vec)))
-      (setf (tramp-file-name-method vec) (if (tramp--test-sh-p) "sftp" "sudo"))
+      (setf (tramp-file-name-method vec) (if (tramp--test-sh-p) "rclone" "sudo"))
       (should-not
        (string-equal (tramp--test-operation vec)
 		     (tramp--handle-test-operation vec))))