-Couple changes for python 2.7.5