Python 3 fixes again.