More Python 2/3 compatibility