Small changes (preparing to go to python 3 maybe)