More from __future__ import unicode_literals
Fix problems with bytes/unicode/str types