bug869897: some fixes