Fixes for Python 2.7