Small improvements. Fixing support for pypy and python 2.6.