Minor improvements in datawarehouse
Fixes name