fixing minor issues in Model classes