More Python 3 compat