Even more fixes for Python3