Fix py3 failures