adjustments to compile on new PyPy