Refinements from previous commit