final changes for issues found on python 3.2