Fixes for Python 3 compatibility