diff --git a/mptrack/CommandSet.cpp b/mptrack/CommandSet.cpp
index 1d8a595aca5..7a5b84912d9 100644
--- a/mptrack/CommandSet.cpp
+++ b/mptrack/CommandSet.cpp
@@ -2101,7 +2101,7 @@ bool CCommandSet::LoadFile(std::istream &iStrm, const mpt::ustring &filenameDesc
 			keymapVersion = Version::Parse(mpt::ToUnicode(mpt::Charset::ASCII, tokens[1]));
 			if(keymapVersion > Version::Current())
 			{
-				errText += MPT_CFORMAT("Keymap was saved with OpenMPT {}, but you are running OpenMPT {}.")(keymapVersion, Version::Current());
+				errText += MPT_CFORMAT("Keymap was saved with OpenMPT {}, but you are running OpenMPT {}.\n")(keymapVersion, Version::Current());
 			}
 			continue;
 		}
diff --git a/mptrack/Mptrack.cpp b/mptrack/Mptrack.cpp
index e9585c56583..e37a397e1ce 100644
--- a/mptrack/Mptrack.cpp
+++ b/mptrack/Mptrack.cpp
@@ -2091,7 +2091,10 @@ CString FormatFileSize(uint64 fileSize)
 			// Variable-length formatting may decide on a whim to switch to scientific formatting, so used a fixed width and trim manually...
 			CString s = mpt::cfmt::fix(size, 2);
 			if(i == 0)
-				s.TrimRight(_T("0."));
+			{
+				if(int pos = s.ReverseFind(_T('.')); pos >= 0)
+					s.Delete(pos, s.GetLength() - pos);
+			}
 			return s + Unit[i];
 		}
 		size /= 1024.0;