More fixes for Python 3 compatibility