Some fixes for dtos and fetchers