More py3 fixes.
Py3 fixes for wsdump.