Fix Python 2/3 unicode/str/bytes issue