ADD: Changes to work with Python 2.8