diff --git a/src/modules/janssonrpcc/janssonrpc.h b/src/modules/janssonrpcc/janssonrpc.h
index 32d14a7cb14..d8b6ffbedbe 100644
--- a/src/modules/janssonrpcc/janssonrpc.h
+++ b/src/modules/janssonrpcc/janssonrpc.h
@@ -94,8 +94,8 @@ extern const str null_str;
 #define jsr_ms_to_tv(ms, tv) \
 	do { \
 		memset(&tv, 0, sizeof(struct timeval)); \
-		tv.tv_sec = time/1000; \
-		tv.tv_usec = ((time % 1000) * 1000); \
+		tv.tv_sec = ms/1000; \
+		tv.tv_usec = ((ms % 1000) * 1000); \
 	} while(0)
 
 #endif /* _JSONRPC_H_ */
diff --git a/src/modules/janssonrpcc/janssonrpc_io.c b/src/modules/janssonrpcc/janssonrpc_io.c
index 3818662c4ab..ebb64705b56 100644
--- a/src/modules/janssonrpcc/janssonrpc_io.c
+++ b/src/modules/janssonrpcc/janssonrpc_io.c
@@ -444,7 +444,7 @@ int jsonrpc_send(str conn, jsonrpc_request_t* req, bool notify_only)
 			free_req_cmd(req->cmd);
 			free_request(req);
 		} else {
-			const struct timeval tv;
+			struct timeval tv;
 			jsr_ms_to_tv(req->timeout, tv);
 
 			req->timeout_ev = evtimer_new(global_ev_base, timeout_cb, (void*)req);
diff --git a/src/modules/janssonrpcc/janssonrpc_request.c b/src/modules/janssonrpcc/janssonrpc_request.c
index 8cddee57048..ecd43c14764 100644
--- a/src/modules/janssonrpcc/janssonrpc_request.c
+++ b/src/modules/janssonrpcc/janssonrpc_request.c
@@ -230,7 +230,7 @@ void retry_cb(int fd, short event, void* arg)
 
 int schedule_retry(jsonrpc_request_t* req)
 {
-	const struct timeval tv;
+	struct timeval tv;
 	unsigned int ltime;
 
 	if(!req) {
diff --git a/src/modules/janssonrpcc/janssonrpc_server.c b/src/modules/janssonrpcc/janssonrpc_server.c
index e8c50cc3fa2..6c4b999b502 100644
--- a/src/modules/janssonrpcc/janssonrpc_server.c
+++ b/src/modules/janssonrpcc/janssonrpc_server.c
@@ -280,7 +280,7 @@ int jsonrpc_server_from_srv(str conn, str srv,
 		server = create_server();
 		CHECK_MALLOC(server);
 
-		shm_str_dup(&server->conn, &/conn);
+		shm_str_dup(&server->conn, &conn);
 		CHECK_MALLOC_GOTO(server->conn.s, error);
 
 		shm_str_dup(&server->addr, &name);