[RFR] Little updates for 1.0.0