diff --git a/lisp/php-ide-phpactor.el b/lisp/php-ide-phpactor.el
index f0a98c82..109cd461 100644
--- a/lisp/php-ide-phpactor.el
+++ b/lisp/php-ide-phpactor.el
@@ -30,8 +30,7 @@
 (require 'phpactor nil t)
 (require 'popup nil t)
 (require 'smart-jump nil t)
-(eval-when-compile
-  (require 'cl-lib))
+(require 'cl-lib)
 
 (defvar-local php-ide-phpactor-buffer nil)
 (defvar-local php-ide-phpactor-hover-last-pos nil)
@@ -55,10 +54,11 @@
 (defcustom php-ide-phpactor-activate-features '(all)
   "A set of Phpactor features you want to enable."
   :tag "PHP-IDE Phpactor Activate Features"
-  :type '(set (const all :tag "All")
+  :type '(set (const :tag "All" all)
               (const hover)
               (const navigation))
-  :safe (lambda (v) (and (listp v)))
+  :safe (lambda (xs) (and (listp xs)
+                          (cl-every (lambda (x) (memq x '(all hover navigation))) xs)))
   :group 'php-ide-phpactor)
 
 (defvar php-ide-phpactor-timer nil
diff --git a/lisp/php-mode.el b/lisp/php-mode.el
index 0f58a9a8..6a6523e1 100644
--- a/lisp/php-mode.el
+++ b/lisp/php-mode.el
@@ -191,7 +191,7 @@ Turning this on will open it whenever `php-mode' is loaded."
                        #'php-flymake))
   "Flymake function to replace, if NIL do not replace."
   :tag "PHP Mode Replace Flymake Diag Function"
-  :type '(choice 'function
+  :type '(choice function
                  (const :tag "Disable to replace" nil)))
 
 (define-obsolete-variable-alias 'php-do-not-use-semantic-imenu 'php-mode-do-not-use-semantic-imenu "1.20.0")
@@ -253,7 +253,7 @@ mumamo-mode turned on.  Detects if there are any HTML tags in the
 buffer before warning, but this is is not very smart; e.g. if you
 have any tags inside a PHP string, it will be fooled."
   :tag "PHP Mode Warn If MuMaMo Off"
-  :type '(choice (const :tag "Warn" t) (const "Don't warn" nil)))
+  :type '(choice (const :tag "Warn" t) (const :tag "Don't warn" nil)))
 
 (defcustom php-mode-coding-style 'pear
   "Select default coding style to use with `php-mode'.
diff --git a/lisp/php.el b/lisp/php.el
index aa09b5df..7176cb8c 100644
--- a/lisp/php.el
+++ b/lisp/php.el
@@ -99,8 +99,8 @@ You can replace \"en\" with your ISO language code."
   "Function to search PHP Manual at cursor position."
   :group 'php
   :tag "PHP Search Documentation Function"
-  :type '(choice (const :tag "Use online documentation" #'php-search-web-documentation)
-                 (const :tag "Use local documentation" #'php-local-manual-search)
+  :type '(choice (const :tag "Use online documentation" php-search-web-documentation)
+                 (const :tag "Use local documentation" php-local-manual-search)
                  (function :tag "Use other function")))
 
 (defcustom php-search-documentation-browser-function nil
@@ -453,7 +453,7 @@ can be used to match against definitions for that classlike."
 
 (defcustom php-imenu-generic-expression 'php-imenu-generic-expression-default
   "Default Imenu generic expression for PHP Mode.  See `imenu-generic-expression'."
-  :type '(choice (alist :key-type string :value-type list)
+  :type '(choice (alist :key-type string :value-type (list string))
                  (const php-imenu-generic-expression-legacy)
                  (const php-imenu-generic-expression-simple)
                  variable)