A few more changes to have dwh_f ready