fixes for obfuscation