diff --git a/cli-session.c b/cli-session.c
index 671735c..0ea33af 100644
--- a/cli-session.c
+++ b/cli-session.c
@@ -123,7 +123,7 @@ static void cli_session_init() {
 
 	/* Auth */
 	cli_ses.lastpubkey = NULL;
-	cli_ses.lastauthtype = NULL;
+	cli_ses.lastauthtype = 0;
 
 	/* For printing "remote host closed" for the user */
 	ses.remoteclosed = cli_remoteclosed;
diff --git a/loginrec.c b/loginrec.c
index 7a9c480..727a290 100644
--- a/loginrec.c
+++ b/loginrec.c
@@ -1401,8 +1401,8 @@ lastlog_filetype(char *filename)
 {
 	struct stat st;
 
-	if (stat(LASTLOG_FILE, &st) != 0) {
-		dropbear_log(LOG_WARNING, "lastlog_perform_login: Couldn't stat %s: %s", LASTLOG_FILE,
+	if (stat(filename, &st) != 0) {
+		dropbear_log(LOG_WARNING, "lastlog_perform_login: Couldn't stat %s: %s", filename,
 			strerror(errno));
 		return 0;
 	}