[RFR] Some fixes