Fix int and string parsing