Pypy hack

Please merge these changes in