Fix python 3 support
Update python 2.6 modules