Fixup some build errors. This is a major, not minor version.
Fix some annoying Obfuscation Check Issues