more fixes for python 3