diff --git a/lib/message/mu-document.cc b/lib/message/mu-document.cc
index 16b55205..983c3cce 100644
--- a/lib/message/mu-document.cc
+++ b/lib/message/mu-document.cc
@@ -33,8 +33,8 @@
 
 using namespace Mu;
 
-constexpr char SepaChar1 = 0xfe;
-constexpr char SepaChar2 = 0xff;
+constexpr uint8_t SepaChar1 = 0xfe;
+constexpr uint8_t SepaChar2 = 0xff;
 
 static void
 add_search_term(Xapian::Document& doc, const Field& field, const std::string& val)
@@ -329,8 +329,8 @@ Document::remove(Field::Id field_id)
 	xapian_try([&]{
 
 		if (auto&& val{xdoc_.get_value(field.value_no())}; !val.empty()) {
-			g_debug("removing value<%u>: '%s'", field.value_no(),
-				val.c_str());
+			// g_debug("removing value<%u>: '%s'", field.value_no(),
+			//	val.c_str());
 			xdoc_.remove_value(field.value_no());
 		}
 
@@ -343,7 +343,7 @@ Document::remove(Field::Id field_id)
 		}
 
 		for (auto&& term: kill_list) {
-			g_debug("removing term '%s'", term.c_str());
+			// g_debug("removing term '%s'", term.c_str());
 			try {
 				xdoc_.remove_term(term);
 			} catch(const Xapian::InvalidArgumentError& xe) {
diff --git a/lib/message/mu-flags.cc b/lib/message/mu-flags.cc
index 731e0562..d45a2424 100644
--- a/lib/message/mu-flags.cc
+++ b/lib/message/mu-flags.cc
@@ -38,8 +38,6 @@ Mu::to_string(Flags flags)
 	return str;
 }
 
-
-
 /*
  * The file-components, ie.
  *     1631819685.fb7b279bbb0a7b66.evergrey:2,RS
@@ -53,7 +51,7 @@ Mu::to_string(Flags flags)
 struct FileParts {
 	std::string	base;
 	char		separator;
-	std::string	flags_suffix;;
+	std::string	flags_suffix;
 };
 
 static FileParts