diff --git a/gptel-gemini.el b/gptel-gemini.el
index fe4f0c5..8910743 100644
--- a/gptel-gemini.el
+++ b/gptel-gemini.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2023  Karthik Chikmagalur
 
 ;; Author: Karthik Chikmagalur <karthikchikmagalur@gmail.com>
-;; Keywords:
 
 ;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
@@ -26,7 +25,7 @@
 (require 'gptel)
 (require 'cl-generic)
 (require 'map)
-(require 'cl-macs)
+(eval-when-compile (require 'cl-lib))
 
 (declare-function prop-match-value "text-property-search")
 (declare-function text-property-search-backward "text-property-search")
diff --git a/gptel-openai.el b/gptel-openai.el
index 018cc4b..903c954 100644
--- a/gptel-openai.el
+++ b/gptel-openai.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 2023  Karthik Chikmagalur
 
 ;; Author: Karthik Chikmagalur <karthikchikmagalur@gmail.com>
-;; Keywords: 
 
 ;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
diff --git a/gptel-transient.el b/gptel-transient.el
index 6bb91f9..c06933d 100644
--- a/gptel-transient.el
+++ b/gptel-transient.el
@@ -520,7 +520,7 @@ This uses the prompts in the variable
               nil t)))
         (when-let ((prompt (gethash choice gptel--crowdsourced-prompts)))
             (setq gptel--system-message prompt)
-            (gptel--suffix-system-message)))
+            (call-interactively #'gptel--suffix-system-message)))
     (message "No prompts available.")))
 
 (transient-define-suffix gptel--suffix-system-message ()