setup: a couple of py3 fixes, cleaning