diff --git a/lisp/electric.el b/lisp/electric.el
index 4f2400825d7..47cb020108c 100644
--- a/lisp/electric.el
+++ b/lisp/electric.el
@@ -439,7 +439,7 @@ This requotes when a quoting key is typed."
   (when (and electric-quote-mode
              (memq last-command-event '(?\' ?\`)))
     (let ((start
-           (if comment-start
+           (if (and comment-start comment-use-syntax)
                (when (or electric-quote-comment electric-quote-string)
                  (let ((syntax (syntax-ppss)))
                    (and (or (and electric-quote-comment (nth 4 syntax))
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index c16384a6c6c..0969048c433 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -3615,7 +3615,7 @@ This is needed in order to hide `last-coding-system-used', which is set
 for process communication also."
   (with-current-buffer (process-buffer proc)
     ;; FIXME: If there is a gateway process, we need communication
-    ;; between several processes.  Too complicate to implement, so we
+    ;; between several processes.  Too complicated to implement, so we
     ;; read output from all processes.
     (let ((p (if (tramp-get-connection-property proc "gateway" nil) nil proc))
 	  buffer-read-only last-coding-system-used)