Fix up parsing