Updates to tagging code.