recovery: compatibility fixes for python 2.6