diff --git a/python_apps/pypo/airtime-liquidsoap b/python_apps/pypo/airtime-liquidsoap
index 75821b942..a9cceb58d 100755
--- a/python_apps/pypo/airtime-liquidsoap
+++ b/python_apps/pypo/airtime-liquidsoap
@@ -9,14 +9,11 @@ api_client_path="/usr/lib/airtime/"
 ls_path="/usr/bin/airtime-liquidsoap --verbose -f -d"
 ls_param="/usr/lib/airtime/pypo/bin/liquidsoap_scripts/ls_script.liq"
 
-exec 2>&1
 export PYTHONPATH=${api_client_path}
 
 rm -f /etc/airtime/liquidsoap.cfg
-
 cd /usr/lib/airtime/pypo/bin/liquidsoap_scripts
 python generate_liquidsoap_cfg.py
 
-exec ${ls_path} ${ls_param}
-
+exec ${ls_path} ${ls_param} 2>&1
 # EOF
diff --git a/python_apps/pypo/liquidsoap_scripts/ls_lib.liq b/python_apps/pypo/liquidsoap_scripts/ls_lib.liq
index 8a6d325eb..09f3d3017 100644
--- a/python_apps/pypo/liquidsoap_scripts/ls_lib.liq
+++ b/python_apps/pypo/liquidsoap_scripts/ls_lib.liq
@@ -190,7 +190,7 @@ def output_to(output_type, type, bitrate, host, port, pass, mount_point, url, de
                     ignore(output_mono(%mp3(bitrate = 320, stereo = false), mean(!source)))
                 end
             end
-        else
+        elsif type == "xxx" then
             if not icecast_vorbis_metadata then
                 source := add(normalize=false, [amplify(0.00001, noise()), !source])
             end
@@ -253,69 +253,69 @@ def output_to(output_type, type, bitrate, host, port, pass, mount_point, url, de
         else
             if bitrate == 24 then 
                 if stereo then
-                    ignore(output_stereo(%opus(bitrate = 24, stereo = true), !source))
+                    ignore(output_stereo(%opus(bitrate = 24, channels = 2), !source))
                 else
-                    ignore(output_mono(%opus(bitrate = 24, stereo = false), mean(!source)))
+                    ignore(output_mono(%opus(bitrate = 24, channels = 1), mean(!source)))
                 end
             elsif bitrate == 32 then
                 if stereo then
-                    ignore(output_stereo(%opus(bitrate = 32, stereo = true), !source))
+                    ignore(output_stereo(%opus(bitrate = 32, channels = 2), !source))
                 else
-                    ignore(output_mono(%opus(bitrate = 32, stereo = false), mean(!source)))
+                    ignore(output_mono(%opus(bitrate = 32, channels = 1), mean(!source)))
                 end
             elsif bitrate == 48 then
                 if stereo then
-                    ignore(output_stereo(%opus(bitrate = 48, stereo = true), !source))
+                    ignore(output_stereo(%opus(bitrate = 48, channels = 2), !source))
                 else
-                    ignore(output_mono(%opus(bitrate = 48, stereo = false), mean(!source)))
+                    ignore(output_mono(%opus(bitrate = 48, channels = 1), mean(!source)))
                 end
             elsif bitrate == 64 then
                 if stereo then
-                    ignore(output_stereo(%opus(bitrate = 64, stereo = true), !source))
+                    ignore(output_stereo(%opus(bitrate = 64, channels = 2), !source))
                 else
-                    ignore(output_mono(%opus(bitrate = 64, stereo = false), mean(!source)))
+                    ignore(output_mono(%opus(bitrate = 64, channels = 1), mean(!source)))
                 end
             elsif bitrate == 96 then
                 if stereo then
-                    ignore(output_stereo(%opus(bitrate = 96, stereo = true), !source))
+                    ignore(output_stereo(%opus(bitrate = 96, channels = 2), !source))
                 else
-                    ignore(output_mono(%opus(bitrate = 96, stereo = false), mean(!source)))
+                    ignore(output_mono(%opus(bitrate = 96, channels = 1), mean(!source)))
                 end
             elsif bitrate == 128 then
                 if stereo then
-                    ignore(output_stereo(%opus(bitrate = 128, stereo = true), !source))
+                    ignore(output_stereo(%opus(bitrate = 128, channels = 2), !source))
                 else
-                    ignore(output_mono(%opus(bitrate = 128, stereo = false), mean(!source)))
+                    ignore(output_mono(%opus(bitrate = 128, channels = 1), mean(!source)))
                 end
             elsif bitrate == 160 then
                 if stereo then
-                    ignore(output_stereo(%opus(bitrate = 160, stereo = true), !source))
+                    ignore(output_stereo(%opus(bitrate = 160, channels = 2), !source))
                 else
-                    ignore(output_mono(%opus(bitrate = 160, stereo = false), mean(!source)))
+                    ignore(output_mono(%opus(bitrate = 160, channels = 1), mean(!source)))
                 end
             elsif bitrate == 192 then
                 if stereo then
-                    ignore(output_stereo(%opus(bitrate = 192, stereo = true), !source))
+                    ignore(output_stereo(%opus(bitrate = 192, channels = 2), !source))
                 else
-                    ignore(output_mono(%opus(bitrate = 192, stereo = false), mean(!source)))
+                    ignore(output_mono(%opus(bitrate = 192, channels = 1), mean(!source)))
                 end
             elsif bitrate == 224 then
                 if stereo then
-                    ignore(output_stereo(%opus(bitrate = 224, stereo = true), !source))
+                    ignore(output_stereo(%opus(bitrate = 224, channels = 2), !source))
                 else
-                    ignore(output_mono(%opus(bitrate = 224, stereo = false), mean(!source)))
+                    ignore(output_mono(%opus(bitrate = 224, channels = 1), mean(!source)))
                 end
             elsif bitrate == 256 then
                 if stereo then
-                    ignore(output_stereo(%opus(bitrate = 256, stereo = true), !source))
+                    ignore(output_stereo(%opus(bitrate = 256, channels = 2), !source))
                 else
-                    ignore(output_mono(%opus(bitrate = 256, stereo = false), mean(!source)))
+                    ignore(output_mono(%opus(bitrate = 256, channels = 1), mean(!source)))
                 end
             elsif bitrate == 320 then
                 if stereo then
-                    ignore(output_stereo(%opus(bitrate = 320, stereo = true), !source))
+                    ignore(output_stereo(%opus(bitrate = 320, channels = 2), !source))
                 else
-                    ignore(output_mono(%opus(bitrate = 320, stereo = false), mean(!source)))
+                    ignore(output_mono(%opus(bitrate = 320, channels = 1), mean(!source)))
                 end
             end
         end