String fixes for 1.73