diff --git a/cli-agentfwd.c b/cli-agentfwd.c
index a8213056313b7ea7b65851085774fc124ce6b4f1..c66145549d69847d4e723b59c3b7d182b5f122c2 100644
--- a/cli-agentfwd.c
+++ b/cli-agentfwd.c
@@ -156,8 +156,6 @@ static buffer * agent_request(unsigned char type, buffer *data) {
 		goto out;
 	}
 	
-	TRACE(("agent_request readlen is %d", readlen))
-
 	buf_resize(inbuf, readlen);
 	buf_setpos(inbuf, 0);
 	ret = atomicio(read, fd, buf_getwriteptr(inbuf, readlen), readlen);
@@ -167,7 +165,6 @@ static buffer * agent_request(unsigned char type, buffer *data) {
 	}
 	buf_incrwritepos(inbuf, readlen);
 	buf_setpos(inbuf, 0);
-	TRACE(("agent_request success, length %d", readlen))
 
 out:
 	if (payload)
diff --git a/cli-kex.c b/cli-kex.c
index 0d5a9d2c3d68c43e4072f4549d7b272839176546..9dadb3cb2ce3065d36ff12203659cf09e58b4c44 100644
--- a/cli-kex.c
+++ b/cli-kex.c
@@ -309,7 +309,6 @@ static void checkhostkey(unsigned char* keyblob, unsigned int keybloblen) {
 		buf_putbytes(line, algoname, algolen);
 		buf_putbyte(line, ' ');
 		len = line->size - line->pos;
-		TRACE(("keybloblen %d, len %d", keybloblen, len))
 		/* The only failure with base64 is buffer_overflow, but buf_getwriteptr
 		 * will die horribly in the case anyway */
 		base64_encode(keyblob, keybloblen, buf_getwriteptr(line, len), &len);
diff --git a/svr-main.c b/svr-main.c
index 43d66560f6dc169984f1720ec4f5b0d7ffc9054b..461aeaf51d92e1d0b66b9582d829dc9d44a7fb8c 100644
--- a/svr-main.c
+++ b/svr-main.c
@@ -271,7 +271,7 @@ void main_noinetd() {
 				goto out;
 			}
 
-			addrandom(&fork_ret, sizeof(fork_ret));
+			addrandom((void*)&fork_ret, sizeof(fork_ret));
 			
 			if (fork_ret > 0) {
 
diff --git a/svr-x11fwd.c b/svr-x11fwd.c
index 92dadd5c54aa502f3f3e08a82d089adeb5c1264b..f6368d7e902c7da8ff2a92016c4104eb514cfd82 100644
--- a/svr-x11fwd.c
+++ b/svr-x11fwd.c
@@ -175,7 +175,7 @@ void x11cleanup(struct ChanSess *chansess) {
 	m_free(chansess->x11authprot);
 	m_free(chansess->x11authcookie);
 
-	TRACE(("chansess %x", chansess))
+	TRACE(("chansess %p", chansess))
 	if (chansess->x11listener != NULL) {
 		remove_listener(chansess->x11listener);
 		chansess->x11listener = NULL;