Tweaks for python 2.7