Merge "Fixed a few Py 2.7 -> 3.x issues."