diff --git a/daemons/lvmlockd/lvmlockd-core.c b/daemons/lvmlockd/lvmlockd-core.c
index 2f470f578..266339da4 100644
--- a/daemons/lvmlockd/lvmlockd-core.c
+++ b/daemons/lvmlockd/lvmlockd-core.c
@@ -787,6 +787,7 @@ int version_from_args(char *args, unsigned int *major, unsigned int *minor, unsi
 	char *n, *d1, *d2;
 
 	strncpy(version, args, MAX_ARGS);
+	version[MAX_ARGS] = '\0';
 
 	n = strstr(version, ":");
 	if (n)
diff --git a/lib/log/log.c b/lib/log/log.c
index 992909000..bd1136393 100644
--- a/lib/log/log.c
+++ b/lib/log/log.c
@@ -69,7 +69,7 @@ void init_log_file(const char *log_file, int append)
 	static const char statfile[] = "/proc/self/stat";
 	const char *env;
 	int pid;
-	long long starttime;
+	unsigned long long starttime;
 	FILE *st;
 	int i = 0;