diff --git a/coolamqp/framing/compilation/utilities.py b/coolamqp/framing/compilation/utilities.py
index 62ce740b7c55af44ec04ac318db644f2f8625685..f35b3810d32793dc4b31fb43db2d48c2966b2db8 100644
--- a/coolamqp/framing/compilation/utilities.py
+++ b/coolamqp/framing/compilation/utilities.py
@@ -169,7 +169,7 @@ def frepr(p, sop=six.text_type):
         p = sop(p)
     s = repr(p)
 
-    if isinstance(p, basestring) and not s.startswith('u'):
+    if isinstance(p, (six.binary_type, six.text_type)) and not s.startswith('u'):
         return ('u' if sop == six.text_type else 'b') + s
     else:
         return s
diff --git a/coolamqp/framing/definitions.py b/coolamqp/framing/definitions.py
index ff63f68ade75f1e803b29b613e846b3ab9fa8603..e387a50b53f813f3f2e4f10d25d7879806fb5e30 100644
--- a/coolamqp/framing/definitions.py
+++ b/coolamqp/framing/definitions.py
@@ -2438,7 +2438,7 @@ class BasicContentPropertyList(AMQPContentPropertyList):
         if zpf in BasicContentPropertyList.PARTICULAR_CLASSES:
             return BasicContentPropertyList.PARTICULAR_CLASSES[zpf].from_buffer(buf, offset)
         else:
-            logger.debug(u'Property field (BasicContentPropertyList:%s) not seen yet, compiling', repr(zpf))
+            logger.debug('Property field (BasicContentPropertyList:%s) not seen yet, compiling', repr(zpf))
             c = compile_particular_content_property_list_class(zpf, BasicContentPropertyList.FIELDS)
             BasicContentPropertyList.PARTICULAR_CLASSES[zpf] = c
             return c.from_buffer(buf, offset)