diff --git a/Makefile b/Makefile
index 83c523a..38d8a38 100644
--- a/Makefile
+++ b/Makefile
@@ -167,6 +167,9 @@ test: $(PGLOADER)
 save: ./src/save.lisp $(LISP_SRC)
 	sbcl --no-userinit --load ./src/save.lisp
 
+check-saved: save
+	$(MAKE) PGLOADER=$(realpath $(PGLOADER)) CL=$(CL) -C test regress
+
 clean-bundle:
 	rm -rf $(BUNDLEDIR)
 	rm -rf $(BUNDLETESTD)/$(BUNDLENAME)/*
diff --git a/src/save.lisp b/src/save.lisp
index 43b0de2..94226cb 100644
--- a/src/save.lisp
+++ b/src/save.lisp
@@ -12,6 +12,16 @@
    when unset."
   (or (sb-ext:posix-getenv name) default))
 
+;; So that we can #+pgloader-image some code away, see main.lisp
+(push :pgloader-image *features*)
+
+;;;
+;;; We need to support *print-circle* for the debug traces of the catalogs,
+;;; and while at it let's enforce *print-pretty* too.
+;;;
+(setf *print-circle* t *print-pretty* t)
+
+
 (require :asdf)                         ; should work in SBCL and CCL
 
 (defvar *quicklisp.lisp* "http://beta.quicklisp.org/quicklisp.lisp")