more fixes for new python