Final fixes for Python 2.7 support