Fixing up parsing