More fixes to analysis scripts.: