Fix errors in setup files for preparation for upload to PyPy