Better Python 2 support