Commandline calls don't work with Coveralls
Also, more Python 3 fixes