Fix python 2.6 compatibility issues