Fix two more problems building with Python3