more string handling fixes