diff --git a/parinfer-rust-changes.el b/parinfer-rust-changes.el
index 4335b9f..0157c29 100644
--- a/parinfer-rust-changes.el
+++ b/parinfer-rust-changes.el
@@ -53,6 +53,7 @@
   (declare-function parinfer-rust-new-change "ext:parinfer-rust" t t)
   (declare-function parinfer-rust-make-changes "ext:parinfer-rust" t t)
   (declare-function parinfer-rust-add-change "ext:parinfer-rust" t t)
+  (declare-function parinfer-rust--execute "parinfer-rust-mode" t t)
   (defvar parinfer-rust-library
     (concat user-emacs-directory "parinfer-rust/"
             (cond
diff --git a/parinfer-rust-helper.el b/parinfer-rust-helper.el
index 9ec7d96..bff20dc 100644
--- a/parinfer-rust-helper.el
+++ b/parinfer-rust-helper.el
@@ -25,8 +25,10 @@
 
 ;;; Code:
 (eval-when-compile
+  (declare-function parinfer-rust-mode-enable "parinfer-rust-mode")
   (defvar parinfer-rust--mode)
-  (defvar parinfer-rust-dim-parens))
+  (defvar parinfer-rust-dim-parens)
+  (defvar parinfer-rust-mode))
 (require 'url)
 
 (defcustom parinfer-rust-troublesome-modes
diff --git a/parinfer-rust-mode.el b/parinfer-rust-mode.el
index 432d8ea..b64d9fd 100644
--- a/parinfer-rust-mode.el
+++ b/parinfer-rust-mode.el
@@ -236,6 +236,8 @@ against and is known to be api compatible.")
   :type 'boolean
   :group 'parinfer-rust-mode)
 
+(define-obsolete-variable-alias 'parinfer-rust--buffer-replace-strategy 'parinfer-rust-buffer-replace-strategy "0.8.7")
+
 (defcustom parinfer-rust-buffer-replace-strategy 'safe
   "The strategy to use when replacing the buffer's text.
 
@@ -250,8 +252,6 @@ node `(elisp)Replacing'"
                 (const :tag "Fast" fast))
   :group 'parinfer-rust-mode)
 
-(define-obsolete-variable-alias 'parinfer-rust--buffer-replace-strategy 'parinfer-rust-buffer-replace-strategy "0.8.7")
-
 (defvar parinfer-rust--option-type '(plist
                                      :key-type symbol
                                      :options ((:force-balance boolean)
@@ -523,16 +523,16 @@ parinfer."
 
 This mutates the current reference to `OPTIONS'
 Ex:
-  (parinfer-rust--set-options parinfer-rust--previous-options ;; '((:cursor-x . 1) (:cursor-line . 1))
-                               '(:cursor-x 2 :cursor-line 2))
-;;=> '((:cursor-x . 2) (:cursor-line . 2))"
-  (mapcar (lambda (option)
-            ;; Note to self set-option might need to clone in order to keep old option immutable
-            (parinfer-rust-set-option options
-                                      (car option)
-                                      (cadr option)))
-             ;; partition plist into key-value pairs
-          (seq-partition new-options 2))
+  (parinfer-rust--set-options parinfer-rust--previous-options ;; \='((:cursor-x . 1) (:cursor-line . 1))
+                               \='(:cursor-x 2 :cursor-line 2))
+;;=> \='((:cursor-x . 2) (:cursor-line . 2))"
+  (mapc (lambda (option)
+          ;; Note to self set-option might need to clone in order to keep old option immutable
+          (parinfer-rust-set-option options
+                                    (car option)
+                                    (cadr option)))
+        ;; partition plist into key-value pairs
+        (seq-partition new-options 2))
   options)
 
 ;; The change interface and associated functions for change tracking