diff --git a/cmd-rename-session.c b/cmd-rename-session.c
index bf180f91..0c250aa6 100644
--- a/cmd-rename-session.c
+++ b/cmd-rename-session.c
@@ -19,6 +19,7 @@
 #include <sys/types.h>
 
 #include <stdlib.h>
+#include <string.h>
 
 #include "tmux.h"
 
@@ -50,6 +51,9 @@ cmd_rename_session_exec(struct cmd *self, struct cmdq_item *item)
 	const char	*newname;
 
 	newname = args->argv[0];
+	if (strcmp(newname, s->name) == 0)
+		return (CMD_RETURN_NORMAL);
+
 	if (!session_check_name(newname)) {
 		cmdq_error(item, "bad session name: %s", newname);
 		return (CMD_RETURN_ERROR);
diff --git a/tty.c b/tty.c
index 6fade4c9..c217b0ff 100644
--- a/tty.c
+++ b/tty.c
@@ -1004,7 +1004,7 @@ tty_cmd_linefeed(struct tty *tty, const struct tty_ctx *ctx)
 	 * off the edge - if so, move the cursor back to the right.
 	 */
 	if (ctx->xoff + ctx->ocx > tty->rright)
-		tty_cursor(tty, tty->rright, ctx->yoff + ctx->ocy);
+		tty_cursor(tty, tty->rright, tty->rlower);
 	else
 		tty_cursor_pane(tty, ctx, ctx->ocx, ctx->ocy);
 
@@ -1134,8 +1134,12 @@ tty_cmd_cell(struct tty *tty, const struct tty_ctx *ctx)
 	struct screen		*s = wp->screen;
 	u_int			 cx, width;
 
-	if (ctx->ocy == ctx->orlower)
+	if (ctx->xoff + ctx->ocx > tty->sx - 1 &&
+	    ctx->yoff + ctx->ocy == ctx->orlower &&
+	    tty_pane_full_width(tty, ctx))
 		tty_region_pane(tty, ctx, ctx->orupper, ctx->orlower);
+	else
+		tty_region_off(tty);
 	tty_margin_off(tty);
 
 	/* Is the cursor in the very last position? */