Nonce support and bug squashing in tags