Have stuck a trigger on the data warehouse table to override the values as a temporary mitigation for some of the problems