diff --git a/libfreerdp/codec/dsp_ffmpeg.c b/libfreerdp/codec/dsp_ffmpeg.c
index d78fb8a1b..2c93a6677 100644
--- a/libfreerdp/codec/dsp_ffmpeg.c
+++ b/libfreerdp/codec/dsp_ffmpeg.c
@@ -664,7 +664,7 @@ static BOOL freerdp_dsp_channel_mix(FREERDP_DSP_CONTEXT* context, const BYTE* sr
 
 			case 2:  /* We only support stereo, so we can not handle this case. */
 			default: /* Unsupported number of channels */
-				WLog_WARN(TAG, "unsuported source channel count %" PRIu16, srcFormat->nChannels);
+				WLog_WARN(TAG, "unsupported source channel count %" PRIu16, srcFormat->nChannels);
 				return FALSE;
 		}
 	}
@@ -692,7 +692,7 @@ static BOOL freerdp_dsp_channel_mix(FREERDP_DSP_CONTEXT* context, const BYTE* sr
 
 		case 1:  /* Invalid, do we want to use a 0 channel sound? */
 		default: /* Unsupported number of channels */
-			WLog_WARN(TAG, "unsuported channel count %" PRIu16, srcFormat->nChannels);
+			WLog_WARN(TAG, "unsupported channel count %" PRIu16, srcFormat->nChannels);
 			return FALSE;
 	}
 
diff --git a/libfreerdp/core/certificate.c b/libfreerdp/core/certificate.c
index d85c5c8db..22a0d2172 100644
--- a/libfreerdp/core/certificate.c
+++ b/libfreerdp/core/certificate.c
@@ -541,7 +541,7 @@ static BOOL certificate_write_server_public_signature(const rdpCertificate* cert
 	Stream_Write_UINT16(s, wSignatureBlobType);
 	Stream_Write_UINT16(s, wSignatureBlobLen);
 
-	WLog_WARN(TAG, "TODO: Calcualte proper signature");
+	WLog_WARN(TAG, "TODO: Calculate proper signature");
 
 	Stream_Write(s, signature, wSignatureBlobLen);
 	return TRUE;
diff --git a/winpr/libwinpr/utils/wlog/Layout.c b/winpr/libwinpr/utils/wlog/Layout.c
index e0c46d884..df8c59f99 100644
--- a/winpr/libwinpr/utils/wlog/Layout.c
+++ b/winpr/libwinpr/utils/wlog/Layout.c
@@ -403,9 +403,9 @@ wLogLayout* WLog_Layout_New(wLog* log)
 	else
 	{
 #ifdef ANDROID
-		layout->FormatString = _strdup("[pid=%pid:tid=%tid] - ");
+		layout->FormatString = _strdup("[pid=%pid:tid=%tid] - [%fn]: ");
 #else
-		layout->FormatString = _strdup("[%hr:%mi:%se:%ml] [%pid:%tid] [%lv][%mn] - ");
+		layout->FormatString = _strdup("[%hr:%mi:%se:%ml] [%pid:%tid] [%lv][%mn] - [%fn]: ");
 #endif
 
 		if (!layout->FormatString)