diff --git a/lib/entropy/spm/plugins/interfaces/portage_plugin/__init__.py b/lib/entropy/spm/plugins/interfaces/portage_plugin/__init__.py
index 83dca0b6e..a23e46290 100644
--- a/lib/entropy/spm/plugins/interfaces/portage_plugin/__init__.py
+++ b/lib/entropy/spm/plugins/interfaces/portage_plugin/__init__.py
@@ -10,6 +10,7 @@
 
 """
 import os
+import io
 import errno
 import bz2
 import hashlib
@@ -74,7 +75,8 @@ class StdoutSplitter(object):
                     self._buf.flush()
                     self._parent.flush()
 
-            self.buffer = Writer(self, self._std.buffer)
+            if isinstance(self._std, io.TextIOWrapper):
+                self.buffer = Writer(self, self._std.buffer)
 
     def __iter__(self):
         return self._std
diff --git a/rigo/RigoDaemon/app/RigoDaemon_app.py b/rigo/RigoDaemon/app/RigoDaemon_app.py
index bc89ea0f1..39c4aeefe 100755
--- a/rigo/RigoDaemon/app/RigoDaemon_app.py
+++ b/rigo/RigoDaemon/app/RigoDaemon_app.py
@@ -3158,7 +3158,7 @@ class RigoDaemonService(dbus.service.Object):
                                 "enqueue_application_action: "
                                 "busied, but cannot remove previous path")
                     try:
-                        fobj = os.fdopen(tmp_fd, "w")
+                        fobj = os.fdopen(tmp_fd, "wb")
                     except OSError as err:
                         write_output(
                             "enqueue_application_action: "