Datawarehouse small fixes