Fix a couple of python bits that python3 doesn't like.