Continued Python 3 conversion