Some more string changes