diff --git a/routers/common/markup.go b/routers/common/markup.go
index 05f48c7902..35b1b21f6a 100644
--- a/routers/common/markup.go
+++ b/routers/common/markup.go
@@ -71,7 +71,7 @@ func RenderMarkup(ctx *context.Base, ctxRepo *context.Repository, mode, text, ur
 	case "gfm": // legacy mode
 		rctx = renderhelper.NewRenderContextRepoFile(ctx, repoModel, renderhelper.RepoFileOptions{
 			DeprecatedOwnerName: repoOwnerName, DeprecatedRepoName: repoName,
-			CurrentRefSubURL: refPath, CurrentTreePath: treePath,
+			CurrentRefPath: refPath, CurrentTreePath: treePath,
 		})
 		rctx = rctx.WithMarkupType(markdown.MarkupName)
 	case "comment":
@@ -87,7 +87,7 @@ func RenderMarkup(ctx *context.Base, ctxRepo *context.Repository, mode, text, ur
 	case "file":
 		rctx = renderhelper.NewRenderContextRepoFile(ctx, repoModel, renderhelper.RepoFileOptions{
 			DeprecatedOwnerName: repoOwnerName, DeprecatedRepoName: repoName,
-			CurrentRefSubURL: refPath, CurrentTreePath: treePath,
+			CurrentRefPath: refPath, CurrentTreePath: treePath,
 		})
 		rctx = rctx.WithMarkupType("").WithRelativePath(filePath) // render the repo file content by its extension
 	default:
diff --git a/routers/web/org/home.go b/routers/web/org/home.go
index 56475c47f0..262b001e6a 100644
--- a/routers/web/org/home.go
+++ b/routers/web/org/home.go
@@ -182,7 +182,7 @@ func prepareOrgProfileReadme(ctx *context.Context, prepareResult *shared_user.Pr
 	}
 
 	rctx := renderhelper.NewRenderContextRepoFile(ctx, profileRepo, renderhelper.RepoFileOptions{
-		CurrentRefSubURL: path.Join("branch", util.PathEscapeSegments(profileRepo.DefaultBranch)),
+		CurrentRefPath: path.Join("branch", util.PathEscapeSegments(profileRepo.DefaultBranch)),
 	})
 	ctx.Data["ProfileReadmeContent"], err = markdown.RenderString(rctx, readmeBytes)
 	if err != nil {
diff --git a/services/cron/cron.go b/services/cron/cron.go
index a0b3c7b5ac..7a4eb21bbb 100644
--- a/services/cron/cron.go
+++ b/services/cron/cron.go
@@ -111,7 +111,7 @@ func ListTasks() TaskTable {
 				spec = tags[1] // the second tag is the task spec
 			}
 			next, _ = e.NextRun()
-			prev, _ = e.LastRunStartedAt()
+			prev, _ = e.LastRun()
 		}
 
 		task.lock.Lock()