Further type changes for PyPy and Numpy