Some more unicode/py3k compat