bug869897: improvements