Obfuscation derp and AOI fix