Various fixes for Python 2.6 support

see content