More Python 3 compatibility work