More Py3 and Lint Fixes

/CC @nmadhok