more py3 compat changes