diff --git a/guile/examples/contacts-export b/guile/examples/contacts-export
index 7f111b4d..7e33c545 100755
--- a/guile/examples/contacts-export
+++ b/guile/examples/contacts-export
@@ -23,7 +23,7 @@ exec guile -e main -s $0 $@
 
 (use-modules (ice-9 getopt-long) (ice-9 format))
 (use-modules (srfi srfi-1))
-(use-modules (mu) (mu message) (mu contact))
+(use-modules (mu))
 
 (define (sort-by-freq c1 c2)
   (< (mu:frequency c1) (mu:frequency c2)))
diff --git a/guile/examples/msg-graphs b/guile/examples/msg-graphs
index dfb547fd..0c35f35c 100755
--- a/guile/examples/msg-graphs
+++ b/guile/examples/msg-graphs
@@ -21,7 +21,8 @@ exec guile -e main -s $0 $@
 (setlocale LC_ALL "")
 
 (use-modules (ice-9 getopt-long) (ice-9 optargs) (ice-9 popen) (ice-9 format))
-(use-modules (mu) (mu message) (mu stats) (mu plot))
+(use-modules (mu) (mu stats) (mu plot))
+;;(use-modules (mu) (mu message) (mu stats) (mu plot))
 
 (define (per-hour expr plain-text)
   "Count the total number of messages for each weekday (0-6 for
diff --git a/guile/examples/mu-biff b/guile/examples/mu-biff
index fc27ba35..d89e834e 100755
--- a/guile/examples/mu-biff
+++ b/guile/examples/mu-biff
@@ -43,7 +43,7 @@ exec guile -e main -s $0 $@
 	  (muhome (option-ref options 'muhome #f))
 	  (query (string-concatenate (option-ref options '() '()))))
     (if help
-      (begin (display msg) (exit 0))
+      (begin (display msg) (newline) (exit 0))
       (begin
 	(mu:initialize muhome)
 	(mu:for-each-message
diff --git a/guile/mu.scm b/guile/mu.scm
index 9fccd7f4..f8467c71 100644
--- a/guile/mu.scm
+++ b/guile/mu.scm
@@ -171,7 +171,7 @@ to get the corresponding type of contacts, or #t to get all. Returns a
 list of <mu-contact> objects."
   (map (lambda (pair) ;; a pair (na . addr)
 	 (make <mu:contact>  #:name (car pair) #:email (cdr pair)))
-    (mu:get-contacts (slot-ref msg 'msg) contact-type)))
+    (mu:c:get-contacts (slot-ref msg 'msg) contact-type)))
 
 (define-method (mu:contacts (msg <mu:message>))
   "Get contacts of all types for message MSG as a list of <mu-contact>
diff --git a/guile/mu/contact.scm b/guile/mu/contact.scm
index 61f36922..843d9c46 100644
--- a/guile/mu/contact.scm
+++ b/guile/mu/contact.scm
@@ -1,4 +1,4 @@
-(define-module (mu contact))
+(define-module (mu contact) :use-module(mu))
 (display "(mu contact) is deprecated, please remove from (use-modules ...)")
 (newline)
 
diff --git a/guile/mu/message.scm b/guile/mu/message.scm
index 61c6e77d..bc9b27ae 100644
--- a/guile/mu/message.scm
+++ b/guile/mu/message.scm
@@ -1,4 +1,4 @@
-(define-module (mu message))
+(define-module (mu message) :use-module (mu))
 (display "(mu message) is deprecated, please remove from (use-modules ...)")
 (newline)
 
diff --git a/guile/mu/part.scm b/guile/mu/part.scm
index 538e92b3..f9b9cd32 100644
--- a/guile/mu/part.scm
+++ b/guile/mu/part.scm
@@ -1,4 +1,4 @@
-(define-module (mu part))
+(define-module (mu part) :use-module (mu))
 (display "(mu part) is deprecated, please remove from (use-modules ...)")
 (newline)
 
diff --git a/guile/mu/plot.scm b/guile/mu/plot.scm
index 38941b32..49e8c05f 100644
--- a/guile/mu/plot.scm
+++ b/guile/mu/plot.scm
@@ -17,7 +17,7 @@
 ;; Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 (define-module (mu plot)
-  :use-module (mu message)
+  :use-module (mu)
   :use-module (ice-9 popen)
   :export (mu:plot))
 
diff --git a/guile/mu/stats.scm b/guile/mu/stats.scm
index 47ba49aa..9377c4bc 100644
--- a/guile/mu/stats.scm
+++ b/guile/mu/stats.scm
@@ -18,7 +18,7 @@
 
 (define-module (mu stats)
   :use-module (oop goops)
-  :use-module (mu message)
+  :use-module (mu)
   :use-module (srfi srfi-1)
   :use-module (ice-9 i18n)
   :use-module (ice-9 r5rs)