Changed how some strings are constructed