A few performance updates