Fixed minor things in Model.