python 3 fixes, dropped python 2.6