Further Tag optimizations