Fix a couple of issues with Analizer.