Fixes on data generator - integrity of correlations is preserved after each run of the data generator