fixes for PyPy/cppyy only