Xaroth -Fix: some more tweaks for py3-specific compat.