More changesd for RH 1.9.0