diff --git a/librb/include/rb_commio.h b/librb/include/rb_commio.h
index 7337604e..09317ce9 100644
--- a/librb/include/rb_commio.h
+++ b/librb/include/rb_commio.h
@@ -150,7 +150,7 @@ void rb_setselect(rb_fde_t *, unsigned int type, PF * handler, void *client_data
 void rb_init_netio(void);
 int rb_select(unsigned long);
 int rb_fd_ssl(rb_fde_t *F);
-int rb_get_fd(rb_fde_t *F);
+rb_platform_fd_t rb_get_fd(rb_fde_t *F);
 const char *rb_get_ssl_strerror(rb_fde_t *F);
 int rb_get_ssl_certfp(rb_fde_t *F, uint8_t certfp[RB_SSL_CERTFP_LEN], int method);
 
diff --git a/librb/src/commio.c b/librb/src/commio.c
index 21bc226e..15bd5080 100644
--- a/librb/src/commio.c
+++ b/librb/src/commio.c
@@ -970,7 +970,7 @@ rb_fd_ssl(rb_fde_t *F)
 	return 0;
 }
 
-int
+rb_platform_fd_t
 rb_get_fd(rb_fde_t *F)
 {
 	if(F == NULL)
diff --git a/librb/src/helper.c b/librb/src/helper.c
index a41fa879..0e653dea 100644
--- a/librb/src/helper.c
+++ b/librb/src/helper.c
@@ -78,7 +78,7 @@ rb_helper_child(rb_helper_cb * read_cb, rb_helper_cb * error_cb, log_cb * ilog,
 	if(x > 2)		/* don't undo what we just did */
 		close(x);
 #else
-	x = 0;			/* shut gcc up */
+	(void) x;	/* shut gcc up */
 #endif
 
 	rb_lib_init(ilog, irestart, idie, 0, maxfd, dh_size, fd_heap_size);