Small changes, better for python.