Fix Fenix reproducibility issues

Fenix has reproducibility issues it seems. We should collect them in child tickets and address them.