diff --git a/configure.ac b/configure.ac
index 418b6d49..6ce08aeb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@ AC_CHECK_LIB([xmlparse], [XML_ParserCreate],
   [AC_DEFINE([READ_GNUCASH], [1], [Support reading gnucash files])
    AM_CONDITIONAL(READ_GNUCASH, true)
    AC_SUBST(LIBS, "-lxmlparse -lxmltok $LIBS")],
-  [AC_MSG_NOTICE([Could not find xmlparse library; gnucash support disabled])
+  [AC_MSG_NOTICE([Could not find xmlparse library: Gnucash support disabled])
    AM_CONDITIONAL(READ_GNUCASH, false)],
   [-lxmltok])
 
diff --git a/ledger.cc b/ledger.cc
index b454a137..ac43df59 100644
--- a/ledger.cc
+++ b/ledger.cc
@@ -194,6 +194,7 @@ void initialize()
 
 void shutdown()
 {
+  shutdown_amounts();
   shutdown_formats();
 }
 
diff --git a/main.cc b/main.cc
index 23b9049b..4d2653e7 100644
--- a/main.cc
+++ b/main.cc
@@ -141,9 +141,7 @@ regexps_to_predicate(std::list<std::string>::const_iterator begin,
 
 int main(int argc, char * argv[], char * envp[])
 {
-#ifdef DO_CLEANUP
   initialize();
-#endif
 
   std::auto_ptr<journal_t> journal(new journal_t);