Clean up confusing -checks)
Python 3 fixes