CAW-71: Text refinements