Trying to fix compat errors with Py3.4