diff --git a/sys/pleora/gstpleorasink.cpp b/sys/pleora/gstpleorasink.cpp
index 1fcd59e..13e9081 100644
--- a/sys/pleora/gstpleorasink.cpp
+++ b/sys/pleora/gstpleorasink.cpp
@@ -301,7 +301,7 @@ gst_pleorasink_set_property (GObject * object, guint property_id,
       break;
     case PROP_OUTPUT_KLV:
       sink->output_klv = g_value_get_boolean (value);
-      sink->source->SetKlvEnabled (sink->output_klv);
+      sink->source->SetKlvEnabled ((bool)sink->output_klv);
       break;
     case PROP_AUTO_MULTICAST:
       sink->auto_multicast = g_value_get_boolean (value);
diff --git a/sys/pleora/streamingchannelsource.cpp b/sys/pleora/streamingchannelsource.cpp
index e85d508..2885006 100644
--- a/sys/pleora/streamingchannelsource.cpp
+++ b/sys/pleora/streamingchannelsource.cpp
@@ -115,7 +115,7 @@ uint32_t GstStreamingChannelSource::GetRequiredChunkSize() const
     }
 }
 
-void GstStreamingChannelSource::SetKlvEnabled (gboolean enable)
+void GstStreamingChannelSource::SetKlvEnabled (bool enable)
 {
     SetChunkEnable (KLV_CHUNKID, enable);
 }
@@ -325,7 +325,7 @@ GByteArray * GstStreamingChannelSource::GetKlvByteArray (GstBuffer * buf)
                   break;
               }
 
-              g_byte_array_append (byte_array, klv_data, klv_size);
+              g_byte_array_append (byte_array, klv_data, (guint)klv_size);
       }
 
       /* chunk length must be multiple of 4 bytes */
diff --git a/sys/pleora/streamingchannelsource.h b/sys/pleora/streamingchannelsource.h
index 1f0c81a..1da196f 100644
--- a/sys/pleora/streamingchannelsource.h
+++ b/sys/pleora/streamingchannelsource.h
@@ -49,7 +49,7 @@ public:
     uint32_t GetChunksSize() const { return GetRequiredChunkSize(); }
 
     uint32_t GetRequiredChunkSize () const;
-    void SetKlvEnabled (gboolean enable = TRUE);
+    void SetKlvEnabled (bool enable = true);
     gboolean GetKlvEnabled ();
     GByteArray * GetKlvByteArray (GstBuffer * buf);