diff --git a/source/lib/sysdep/ia32/ia32.cpp b/source/lib/sysdep/ia32/ia32.cpp
index a24c730c73..2836804687 100644
--- a/source/lib/sysdep/ia32/ia32.cpp
+++ b/source/lib/sysdep/ia32/ia32.cpp
@@ -275,7 +275,7 @@ const char* ia32_IdentifierString()
 	// identifier_string already holds a valid brand string; pretty it up.
 	else
 	{
-		const char* undesired_strings[] = { "(tm)", "(R)", "CPU " };
+		const char* const undesired_strings[] = { "(tm)", "(TM)", "(R)", "CPU " };
 		std::for_each(undesired_strings, undesired_strings+ARRAY_SIZE(undesired_strings),
 			StringStripper(identifier_string, ARRAY_SIZE(identifier_string)));
 
diff --git a/source/lib/tests/test_base32.h b/source/lib/tests/test_base32.h
index eedae3f9e6..ae2b133ec5 100644
--- a/source/lib/tests/test_base32.h
+++ b/source/lib/tests/test_base32.h
@@ -2,7 +2,7 @@
 
 #include "lib/base32.h"
 
-class TestLib : public CxxTest::TestSuite 
+class TestBase32 : public CxxTest::TestSuite 
 {
 public:
 	void test_base32()
diff --git a/source/lib/tests/test_bits.h b/source/lib/tests/test_bits.h
index ddebeacd9a..91a1d2d58d 100644
--- a/source/lib/tests/test_bits.h
+++ b/source/lib/tests/test_bits.h
@@ -2,7 +2,7 @@
 
 #include "lib/bits.h"
 
-class TestLib : public CxxTest::TestSuite 
+class TestBits : public CxxTest::TestSuite 
 {
 public:
 	void test_is_pow2()
@@ -33,11 +33,11 @@ public:
 		TS_ASSERT_EQUALS(ceil_log2(0x80000000u), 31u);
 	}
 
-	void test_ilog2f()
+	void test_floor_log2()
 	{
-		TS_ASSERT_EQUALS(ilog2(1.f), 0);
-		TS_ASSERT_EQUALS(ilog2(3.f), 1);
-		TS_ASSERT_EQUALS(ilog2(256.f), 8);
+		TS_ASSERT_EQUALS(floor_log2(1.f), 0);
+		TS_ASSERT_EQUALS(floor_log2(3.f), 1);
+		TS_ASSERT_EQUALS(floor_log2(256.f), 8);
 	}
 
 	void test_round_up_to_pow2()
diff --git a/source/lib/tests/test_fnv_hash.h b/source/lib/tests/test_fnv_hash.h
index 9def27771e..5f8a2640f6 100644
--- a/source/lib/tests/test_fnv_hash.h
+++ b/source/lib/tests/test_fnv_hash.h
@@ -2,7 +2,7 @@
 
 #include "lib/fnv_hash.h"
 
-class TestLib : public CxxTest::TestSuite 
+class TestFnvHash : public CxxTest::TestSuite 
 {
 public:
 	void test_fnv_hash()
diff --git a/source/lib/tests/test_regex.h b/source/lib/tests/test_regex.h
index 1b2914aaae..ba168a0112 100644
--- a/source/lib/tests/test_regex.h
+++ b/source/lib/tests/test_regex.h
@@ -2,7 +2,7 @@
 
 #include "lib/regex.h"
 
-class TestLib : public CxxTest::TestSuite 
+class TestRegex : public CxxTest::TestSuite 
 {
 public:
 	void test_regex()
diff --git a/source/ps/Util.cpp b/source/ps/Util.cpp
index 38665c6e0b..e30a25365f 100644
--- a/source/ps/Util.cpp
+++ b/source/ps/Util.cpp
@@ -65,9 +65,9 @@ void WriteSystemInfo()
 	time_t seconds;
 	time(&seconds);
 	struct tm* t = gmtime(&seconds);
-	const size_t chars_written = strftime(timestamp_buf, ARRAY_SIZE(timestamp_buf), "(generated %Y-%m-%d %H:%M:%S)", t);
+	const size_t chars_written = strftime(timestamp_buf, ARRAY_SIZE(timestamp_buf), "(generated %Y-%m-%d %H:%M:%S UTC)", t);
 	debug_assert(chars_written != 0);
-	fprintf(f, "%s\n", timestamp_buf);
+	fprintf(f, "%s\n\n", timestamp_buf);
 	}
 
 	// OS