Fixed not-obfuscated mappings and multi-block issues.