py3: more fixes