Trivial fixes for Py3 compatibility