FIX: Fixes for py2.6
Merge pull request #1066 from Eric89GXL/m072

FIX: Fixes for py2.6