Minor fixes to Tag