A couple of updates to ensure py3k compatibility.