Some obfuscation changes