Fixed analysis scripts