Fixed parsing data type errors