String fixes

Closes #1191.