A few little fixes for compatibility with Python 3 and conda 3.20.