Made relevant Python3 changes.