Changes to force py3k to work