Some PyPy fixes