Fixed some tag stuff