build: fix TagName overflow issues