diff --git a/scheme/vm/external-call.scm b/scheme/vm/external-call.scm
index ad51421..c3bd675 100644
--- a/scheme/vm/external-call.scm
+++ b/scheme/vm/external-call.scm
@@ -15,8 +15,9 @@
 	   (stack-nargs (extract-fixnum (pop)))
 	   (rest-list (pop)))
       (if (< maximum-external-call-args
-	     nargs)
+	     (- nargs 2)); ignore procedure & name
 	  (raise-exception too-many-arguments-to-external-procedure
+			   0
 			   (stack-ref (- stack-nargs 1))
 			   nargs)
 	  (begin
diff --git a/scsh/time.scm b/scsh/time.scm
index c93f060..e85d427 100644
--- a/scsh/time.scm
+++ b/scsh/time.scm
@@ -200,7 +200,6 @@
   (format-date "~a ~b ~d ~H:~M:~S ~Y" date))
 
 (define (format-date fmt date)
-  (warn "format-date called, this will fail since it calls with 13 args")
   (check-arg date? date format-date)
   (receive (err result)
 	   (%format-date/errno fmt