[BUG #7884] Some adjustments