Fixing dtos