Fixed tags and errors