Fix typos and missing tags