Fixed ctor parsing and generation