A few refinements.