Fix errors and missing entries