diff --git a/Python/errors.c b/Python/errors.c
index 443235a..4ef491f 100644
--- a/Python/errors.c
+++ b/Python/errors.c
@@ -54,7 +54,7 @@
 {
 	if (exception != NULL &&
 	    !PyExceptionClass_Check(exception)) {
-		PyObject *excstr = PyObject_Repr(exception);
+		PyObject *excstr = PyObject_ReprStr8(exception);
 		PyErr_Format(PyExc_SystemError,
 			     "exception %s not a BaseException subclass",
 			     PyString_AS_STRING(excstr));
diff --git a/Python/symtable.c b/Python/symtable.c
index 89c7914..58f673e 100644
--- a/Python/symtable.c
+++ b/Python/symtable.c
@@ -94,7 +94,7 @@
 		      "<symtable entry %.100s(%ld), line %d>",
 		      PyString_AS_STRING(ste->ste_name),
 		      PyInt_AS_LONG(ste->ste_id), ste->ste_lineno);
-	return PyString_FromString(buf);
+	return PyUnicode_FromString(buf);
 }
 
 static void