Updates to support Python 2