Add Jean Marie suggested string changes