More Python 3 compatibility tweaks