fixed more compilation errors in Model project