[RFR] Minor fixes