Small fixes for Python 3-x compatibility