diff --git a/lib/entropy/client/misc.py b/lib/entropy/client/misc.py
index da99038fb..60c53c0ab 100644
--- a/lib/entropy/client/misc.py
+++ b/lib/entropy/client/misc.py
@@ -251,7 +251,8 @@ class ConfigurationFiles(dict):
                 self._entropy.output(
                     darkred("%s: %s") % (
                         _("Automerging file"),
-                        darkgreen(filepath),
+                        darkgreen(
+                            self._unicode_path(filepath)),
                         ),
                     importance = 0,
                     level = "info"
diff --git a/lib/entropy/output.py b/lib/entropy/output.py
index 1dcac67d7..e6a6e1aea 100644
--- a/lib/entropy/output.py
+++ b/lib/entropy/output.py
@@ -489,6 +489,12 @@ def _std_write(msg, stderr = False):
     if stderr:
         obj = sys.stderr
 
+    if const_is_python3() and not const_isunicode(msg):
+        obj.flush()
+        obj.buffer.write(msg)
+        obj.flush()
+        return
+
     try:
         obj.write(msg)
     except UnicodeEncodeError: