Adjustments for Python 3 compatibility