Fixed parsing of some strings.