PY3 compatibility updates.