Fixes for python 3 -- bad unicode