Root tag fixes