diff --git a/Makefile b/Makefile
index 8cfdb266..131a73d2 100644
--- a/Makefile
+++ b/Makefile
@@ -58,7 +58,7 @@ SO  = .dll
 EXE = .exe
 CC = gcc
 CLIBFLAGS = -shared
-CPPFLAGS += -DSEXP_USE_STRING_STREAMS=0 -DBUILDING_DLL -DSEXP_USE_DEBUG=0
+CPPFLAGS += -DSEXP_USE_STRING_STREAMS=0 -DBUILDING_DLL
 LDFLAGS += -Wl,--out-implib,libchibi-scheme$(SO).a
 STATICFLAGS = -DSEXP_USE_DL=0
 LIBDL = 
@@ -68,7 +68,8 @@ SO  = .dll
 EXE = .exe
 CC = gcc
 CLIBFLAGS = -shared
-LDFLAGS += -DSEXP_USE_STRING_STREAMS=0 -Wl,--out-implib,libchibi-scheme$(SO).a
+CPPFLAGS += -DSEXP_USE_STRING_STREAMS=0
+LDFLAGS += -Wl,--out-implib,libchibi-scheme$(SO).a
 else
 SO  = .so
 EXE =
diff --git a/lib/chibi/repl.module b/lib/chibi/repl.module
index 5c1035a7..405d9a0e 100644
--- a/lib/chibi/repl.module
+++ b/lib/chibi/repl.module
@@ -2,5 +2,6 @@
 (define-module (chibi repl)
   (export repl)
   (import-immutable (scheme))
-  (import (chibi process))
+  (import (chibi process)
+          (chibi term edit-line))
   (include "repl.scm"))
diff --git a/lib/chibi/term/edit-line.scm b/lib/chibi/term/edit-line.scm
index cd8fd376..c3b022ea 100644
--- a/lib/chibi/term/edit-line.scm
+++ b/lib/chibi/term/edit-line.scm
@@ -1,3 +1,7 @@
+;;;; edit-line.scm - pure scheme line editing tool
+;;
+;; Copyright (c) 2010 Alex Shinn.  All rights reserved.
+;; BSD-style license: http://synthcode.com/license.txt
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; vt100 terminal utilities
diff --git a/lib/srfi/38.scm b/lib/srfi/38.scm
index 62650ddb..a5149b4d 100644
--- a/lib/srfi/38.scm
+++ b/lib/srfi/38.scm
@@ -197,7 +197,7 @@
                   (if (memv (peek-char in) delimiters)
                       c
                       (read-named-char c in))))
-               (else ; last resort
+               (else
                 (error "unknown # syntax: " (peek-char in)))))
             ((#\()
              (read-char in)