python2.6 fix
python3 fixes