Corrected a few bugs in analyzers