More py3k fixes
Automated merge for py3k testing