Fixed remaining Python 2.7 issues.