Some minor fixes to tags