Schema description fixes