diff --git a/dbutils.c b/dbutils.c
index ee704f36..03ce950d 100644
--- a/dbutils.c
+++ b/dbutils.c
@@ -428,7 +428,7 @@ getMasterConnection(PGconn *standby_conn, char *schema, char *cluster,
  * return 1 if Ok; 0 if any error ocurred; -1 if timeout reached
  */
 int
-wait_connection_availability(PGconn *conn, unsigned long timeout)
+wait_connection_availability(PGconn *conn, long long timeout)
 {
 	PGresult   *res;
 	fd_set      read_set;
diff --git a/dbutils.h b/dbutils.h
index 4da89ff6..5fb882bc 100644
--- a/dbutils.h
+++ b/dbutils.h
@@ -39,6 +39,6 @@ const char	 *get_cluster_size(PGconn *conn);
 PGconn *getMasterConnection(PGconn *standby_conn, char *schema, char *cluster,
                             int *master_id, char *master_conninfo_out);
 
-int wait_connection_availability(PGconn *conn, unsigned long timeout);
+int wait_connection_availability(PGconn *conn, long long timeout);
 bool CancelQuery(PGconn *conn, int timeout);
 #endif
diff --git a/repmgrd.c b/repmgrd.c
index 137133b4..93c52f9f 100644
--- a/repmgrd.c
+++ b/repmgrd.c
@@ -144,7 +144,7 @@ static void terminate(int retval);
 static void setup_event_handlers(void);
 #endif
 
-static void do_daemonize();
+static void do_daemonize(void);
 static void check_and_create_pid_file(const char *pid_file);
 
 static void