Further fixes for x86_64 compat in tag.c