py3 additional fixes