Fix more references to areas which could be unobfuscated