Fixed python 2.6 specific issues