More Python2/3 fixes.