Fixes in DA dbuser-map generator