Fixes for obfuscated builds