Fixes for PY3.x