diff --git a/marshal.go b/marshal.go
index 9709d5a..9cb1a4e 100644
--- a/marshal.go
+++ b/marshal.go
@@ -25,6 +25,14 @@ func (pb *Files) marshal(f *File) {
 	fmt.Fprintln(w, ")")
 	fmt.Fprintln(w, "")
 
+	if f.Bases.DoMarshal {
+		marshalThing(w, f.Bases.Name)
+	}
+
+	if f.Base.DoMarshal {
+		marshalThing(w, f.Base.Name)
+	}
+
 	for _, msg := range f.MsgNames {
 		if msg.DoMarshal {
 			marshalThing(w, msg.Name)
diff --git a/sort.go b/sort.go
index 8e4fda9..efbb14e 100644
--- a/sort.go
+++ b/sort.go
@@ -51,7 +51,7 @@ func (pb *Files) makeNewSortfile(pf *File) error {
 }
 
 func (pf *File) processMessage(msg *MsgName, wSort, wFind io.Writer) error {
-	log.Printf("ADDING FIND AND SORT FOR MESSAGE %s WITH %+v\n", msg.Name, msg.Vars)
+	log.Printf("Generating functions for  %s\n", msg.Name)
 	for _, v := range msg.Vars {
 		if !v.IsRepeated {
 			log.Printf("\tSKIP %s %s\n", v.VarName, v.VarType)