diff --git a/routers/web/group/home.go b/routers/web/group/home.go
index 200ce22c6a..06486c09de 100644
--- a/routers/web/group/home.go
+++ b/routers/web/group/home.go
@@ -114,7 +114,7 @@ func Home(ctx *context.Context) {
 	ctx.Data["Repos"] = repos
 	ctx.Data["Total"] = count
 
-	pager := context.NewPagination(int(count), setting.UI.User.RepoPagingNum, page, 5)
+	pager := context.NewPagination(count, setting.UI.User.RepoPagingNum, page, 5)
 	pager.AddParamFromRequest(ctx.Req)
 	ctx.Data["Page"] = pager
 	ctx.HTML(http.StatusOK, tplGroupHome)
diff --git a/routers/web/group/team.go b/routers/web/group/team.go
index 4a06d6f9b2..45f771e42c 100644
--- a/routers/web/group/team.go
+++ b/routers/web/group/team.go
@@ -141,7 +141,7 @@ func EditTeamPost(ctx *context.Context) {
 		return
 	}
 	if gt.AccessMode < perm.AccessModeAdmin && len(unitPerms) == 0 {
-		ctx.RenderWithErr(ctx.Tr("form.team_no_units_error"), tplTeamEdit, &form)
+		ctx.RenderWithErrDeprecated(ctx.Tr("form.team_no_units_error"), tplTeamEdit, &form)
 		return
 	}
 	if err := group_service.UpdateGroupTeam(ctx, gt); err != nil {
diff --git a/routers/web/user/heatmap.go b/routers/web/user/heatmap.go
index e81739e5b8..0942db4dfd 100644
--- a/routers/web/user/heatmap.go
+++ b/routers/web/user/heatmap.go
@@ -56,7 +56,7 @@ func DashboardHeatmap(ctx *context.Context) {
 	if ctx.Org.Organization == nil {
 		data, err = activities_model.GetUserHeatmapDataByUser(ctx, ctx.ContextUser, ctx.Doer)
 	} else {
-		data, err = activities_model.GetUserHeatmapDataByOrgTeam(ctx, ctx.Org.Organization, ctx.Org.Team, ctx.Doer)
+		data, err = activities_model.GetUserHeatmapDataByOrgTeam(ctx, ctx.Org.Organization, ctx.Org.Team, ctx.RepoGroup.Group, ctx.Doer)
 	}
 	if err != nil {
 		ctx.ServerError("GetUserHeatmapData", err)