Work towards 0.9.1 support