diff --git a/cpuid_tool/cpuid_tool.c b/cpuid_tool/cpuid_tool.c
index bd64ce1..6717f1a 100644
--- a/cpuid_tool/cpuid_tool.c
+++ b/cpuid_tool/cpuid_tool.c
@@ -447,11 +447,11 @@ static void print_info(output_data_switch query, struct cpu_raw_data_t* raw,
 				if ((value = cpu_msrinfo(handle, INFO_APERF)) != CPU_INVALID_VALUE)
 					fprintf(fout, "  MSR.aperf  : %d MHz\n", value);
 				if ((value = cpu_msrinfo(handle, INFO_MIN_MULTIPLIER)) != CPU_INVALID_VALUE)
-					fprintf(fout, "  min. multi.: %d\n", value / 100.0);
+					fprintf(fout, "  min. multi.: %.2lf\n", value / 100.0);
 				if ((value = cpu_msrinfo(handle, INFO_CUR_MULTIPLIER)) != CPU_INVALID_VALUE)
-					fprintf(fout, "  cur. multi.: %d\n", value / 100.0);
+					fprintf(fout, "  cur. multi.: %.2lf\n", value / 100.0);
 				if ((value = cpu_msrinfo(handle, INFO_MAX_MULTIPLIER)) != CPU_INVALID_VALUE)
-					fprintf(fout, "  max. multi.: %d\n", value / 100.0);
+					fprintf(fout, "  max. multi.: %.2lf\n", value / 100.0);
 				if ((value = cpu_msrinfo(handle, INFO_TEMPERATURE)) != CPU_INVALID_VALUE)
 					fprintf(fout, "  temperature: %d degrees Celsius\n", value);
 				if ((value = cpu_msrinfo(handle, INFO_THROTTLING)) != CPU_INVALID_VALUE)
diff --git a/libcpuid/rdmsr.c b/libcpuid/rdmsr.c
index ee8fec8..e204813 100644
--- a/libcpuid/rdmsr.c
+++ b/libcpuid/rdmsr.c
@@ -936,11 +936,11 @@ int cpu_msrinfo(struct msr_driver_t* handle, cpu_msrinfo_request_t which)
 		return CPU_INVALID_VALUE;
 	}
 
+	info.handle = handle;
 	if (!init) {
 		err  = cpuid_get_raw_data(&raw);
 		err += cpu_ident_internal(&raw, &id, &internal);
 		info.cpu_clock = cpu_clock_measure(250, 1);
-		info.handle = handle;
 		info.id = &id;
 		info.internal = &internal;
 		init = 1;