RFR - More fixes