some more shallow py3 fixes