Fix dto mapping bugs