Rollback some dto issues