diff --git a/demo/beziertest.lisp b/demo/beziertest.lisp
index dc5bb91a2899fd5c1e02c27737b84e35d2500332..a8b2c2feb82092a6bc966e91a6b03bc4c9f04553 100644
--- a/demo/beziertest.lisp
+++ b/demo/beziertest.lisp
@@ -57,11 +57,11 @@
     ;; we don't need to worry about overflows.
     (let ((factor (ash (min width height) 5)))
       (dotimes (i (length lines))
-	(setf (svref lines i)
-	      (ash (* (svref lines i) factor) -16)))
+	(setf (aref lines i)
+	      (ash (* (aref lines i) factor) -16)))
       (dotimes (i (length curves))
-	(setf (svref curves i)
-	      (ash (* (svref curves i) factor) -16))))
+	(setf (aref curves i)
+	      (ash (* (aref curves i) factor) -16))))
     
     (map-window win)				; Map the window
     ;; Handle events
diff --git a/test/image.lisp b/test/image.lisp
index 13e053ed1086b67abd06df228d2b6d9312de19aa..15dae1f0c2c2d51393b086e8109ef999668bd080 100644
--- a/test/image.lisp
+++ b/test/image.lisp
@@ -37,6 +37,7 @@
 	  *image-test-get-image-result-type-choices*)
 	(get-image-image-x-format-choices
 	  *image-test-get-image-image-x-format-choices*))
+  (declare (ignore host))
   (let* ((display nil)
 	 (abort t)
 	 (images nil))