diff --git a/src/descrambler/capmt.c b/src/descrambler/capmt.c
index 4f8be5ad..3ccbd4f3 100755
--- a/src/descrambler/capmt.c
+++ b/src/descrambler/capmt.c
@@ -644,13 +644,9 @@ capmt_queue_msg
   msg->cm_adapter = adapter;
   msg->cm_sid     = sid;
   if (flags & CAPMT_MSG_FAST)
-  {
     TAILQ_INSERT_HEAD(&capmt->capmt_writeq, msg, cm_link);
-  }
   else
-  {
       TAILQ_INSERT_TAIL(&capmt->capmt_writeq, msg, cm_link);
-  }
   tvh_write(capmt->capmt_pipe.wr, "c", 1);
 }
 
diff --git a/src/input/mpegts/dvb_psi.c b/src/input/mpegts/dvb_psi.c
index 547fe324..c0cd7358 100755
--- a/src/input/mpegts/dvb_psi.c
+++ b/src/input/mpegts/dvb_psi.c
@@ -1377,7 +1377,7 @@ psi_parse_pmt
     case 0x81:
       hts_stream_type = SCT_AC3;
       break;
-      
+
     case 0x0f:
       hts_stream_type = SCT_MP4A;
       break;
diff --git a/src/input/mpegts/dvb_support.c b/src/input/mpegts/dvb_support.c
index c611c271..0d5ed7aa 100755
--- a/src/input/mpegts/dvb_support.c
+++ b/src/input/mpegts/dvb_support.c
@@ -325,8 +325,7 @@ dvb_get_string
     if (auto_pl_charset)
       ic = convert_iso_8859[2];
     else
-      ic=convert_gb;//add
-      //ic = convert_iso6937;
+      ic = convert_iso6937;
     break;
   }