Better compatibility with Habari 0.9