Some quirks for full py3 compat