Fix field munging and tools.analyzer key changes