--- a/src/lib/dev.c
+++ b/src/lib/dev.c
@@ -64,7 +64,7 @@ static int create_tmpfiles_d_entry(const char *prefix,
 		return vzctl_err(-1, errno, "Failed to create %s", buf);
 	fprintf(fp, "%c /dev/%s 0700 root root - %d:%d\n",
 			(mode & S_IFBLK) ? 'b' : 'c',
-			name, gnu_dev_major(dev), gnu_dev_minor(dev));
+			name, major(dev), minor(dev));
 	fclose(fp);
 
 	return 0;
--- a/src/lib/config.c
+++ b/src/lib/config.c
@@ -2715,7 +2715,7 @@ static int write_conf(const char *fname, list_head_t *head)
 	const char *suffix = ".tmp";
 	char *fmt;
 
-	file = canonicalize_file_name(fname);
+	file = realpath(fname, NULL);
 	if (file == NULL) {
 		if (errno != ENOENT) {
 			logger(-1, errno, "Unable to resolve path %s", fname);