Fixed some bugs in DTO DSL