Updates to allow for python2