More Python 3 compatibility fixes
Add Python 3 targets to CI