fixes for RH 6x