fix for pypy coverage and more headers