Small changes to both calculation and analysis datasets to get latest round of calculation changes flowing correctly through both scripts