(PUP-2689) Fix tag oddities