A few string changes