A bit more Python 3 fixes