More quick and dirty py3 fixes