small string conversion fixes
merge conflicts