diff --git a/clim/gestures.lisp b/clim/gestures.lisp
index 7288d190ec855f96e3533e4098d86948786f48a3..dbc91ecc8fa19af72fea52c43e5d4937ff91c449 100644
--- a/clim/gestures.lisp
+++ b/clim/gestures.lisp
@@ -138,6 +138,8 @@
     (keyboard-event                        ;--- KEY-PRESS-EVENT?
       (keyboard-event-matches-gesture-name-p event gesture-name port))))
 
+;;; NOTE seems to break with a NIL somewhere if mouse scroll wheel is used.
+;;; -- jacek.zlydach 2017-06-03
 (defun button-press-event-matches-gesture-name-p (event gesture-name &optional port)
   #---ignore (declare (ignore port))
   #+++ignore (unless port
@@ -146,8 +148,8 @@
         (modifier-state (event-modifier-state event)))
     (declare (type fixnum button modifier-state))
     (button-and-modifier-state-matches-gesture-name-p
-      (- (integer-length button) #.(integer-length +pointer-left-button+))
-      modifier-state gesture-name)))
+     (- (integer-length button) #.(integer-length +pointer-left-button+))
+     modifier-state gesture-name)))
 
 ;; GESTURE-NAME either names a gesture, or is a canonicalized gesture spec
 (defun keyboard-event-matches-gesture-name-p (event gesture-name &optional port)
diff --git a/clim/output-protocol.lisp b/clim/output-protocol.lisp
index b2d69c8d2b3fe24e0dc3bb1417c1bd917a0e0e09..57147cf6b01ff09a7dbd03a9bdf882a2c08bd9fc 100644
--- a/clim/output-protocol.lisp
+++ b/clim/output-protocol.lisp
@@ -1061,8 +1061,7 @@
                                        string start end
                                        cursor-x cursor-y height baseline style max-x)
   ;; Continuation is a function which takes L T R B Baseline
-  (declare (dynamic-extent continuation)
-           (values new-cursor-x new-cursor-y new-height new-baseline))
+  (declare (dynamic-extent continuation))
   (unless start (setq start 0))
   (unless end (setq end (length string)))
   (let ((vsp (stream-vertical-spacing stream))
diff --git a/gramps-clim2.asd b/gramps-clim2.asd
index 806fd2163912babd78cd9c34696979d3a9e7b443..91857d6baefb1c6d9a6e75ee7c83846b90f8e07c 100644
--- a/gramps-clim2.asd
+++ b/gramps-clim2.asd
@@ -215,7 +215,7 @@
              ;(:file "cad-demo" :depends-on ("demo-driver"))
              ;(:file "navdata" :depends-on ("packages"))
              ;(:file "navfun" :depends-on ("navdata"))
-             ;(:file "puzzle" :depends-on ("demo-driver"))
+             (:file "puzzle" :depends-on ("demo-driver"))
              ;(:file "address-book" :depends-on ("demo-driver"))
              ;(:file "thinkadot" :depends-on ("demo-driver"))
              ;(:file "plot" :depends-on ("demo-driver"))