Python 3 fixes related to zip