Late string changes (18 Jan) for 4.0