more Python 3 changes