Fixing unicode support for python 2/3