diff --git a/scheme/nuit-engine.scm b/scheme/nuit-engine.scm
index 5b278f8..c37352c 100644
--- a/scheme/nuit-engine.scm
+++ b/scheme/nuit-engine.scm
@@ -318,7 +318,7 @@
 	(loop (wait-for-input) #f maybe-selector)))
 
      ;; F7 toggle scheme-mode / command-mode (FIXME: find a better key)
-     ((= ch key-f7)
+     ((= ch key-home)
       (toggle-command/scheme-mode)
       (loop (wait-for-input) #f #f))
 
@@ -567,11 +567,10 @@
   (cond
    ((determine-plugin-by-type result)
     => (lambda (view-plugin)
-	 (let ((instance ((view-plugin-constructor view-plugin))))
-	   (send instance 'init result result-buffer))))
+	 ((view-plugin-constructor view-plugin)
+	   result result-buffer)))
    (else 
-    (let ((instance (make-standard-viewer)))
-      (send instance 'init result result-buffer)))))
+    ((make-standard-viewer) result result-buffer))))
 
 ;;scroll buffer after one command was entered
 (define (scroll-command-buffer)