Data obfuscation template fixes.