Minor fixes after the Python 3 merge.