Fixup strings properly now