Final tweaks to analyzers.