Minor tag fixes