Index: openacs-4/packages/acs-tcl/tcl/text-html-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/text-html-procs.tcl,v
diff -u -r1.109.2.1 -r1.109.2.2
--- openacs-4/packages/acs-tcl/tcl/text-html-procs.tcl	1 Mar 2019 11:53:03 -0000	1.109.2.1
+++ openacs-4/packages/acs-tcl/tcl/text-html-procs.tcl	1 Mar 2019 12:03:09 -0000	1.109.2.2
@@ -2136,8 +2136,22 @@
     }
 
     # For backwards compatibility
-    set from [ad_decode $from html text/html text text/plain plain text/plain pre text/plain $from]
-    set to   [ad_decode $to   html text/html text text/plain plain text/plain pre text/plain $to]
+    switch $from {
+        "html" {
+            set from text/html
+        }
+        "text" - "plain" - "pre" {
+            set from text/plain
+        }
+    }
+    switch $to {
+        "html" {
+            set to text/html
+        }
+        "text" - "plain" - "pre" {
+            set to text/plain
+        }
+    }
 
     if { ![ad_html_text_convertible_p -from $from -to $to] } {
         error "Illegal mime types for conversion - from: $from to: $to"
Index: openacs-4/packages/acs-tcl/tcl/apm-xml-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-xml-procs.tcl,v
diff -u -r1.33 -r1.33.2.1
--- openacs-4/packages/acs-tcl/tcl/apm-xml-procs.tcl	25 Jul 2018 01:39:50 -0000	1.33
+++ openacs-4/packages/acs-tcl/tcl/apm-xml-procs.tcl	1 Mar 2019 12:07:23 -0000	1.33.2.1
@@ -62,7 +62,7 @@
     db_1row package_version_select {}
 
     apm_log APMDebug "APM: Writing Package Specification for $pretty_name $version_name"
-    set auto_mount_tag [ad_decode $auto_mount "" "" "<auto-mount>$auto_mount</auto-mount>\n"]
+    set auto_mount_tag [expr {$auto_mount ne "" ? "<auto-mount>$auto_mount</auto-mount>\n" : ""}]
     append spec "<?xml version=\"1.0\"?>
 <!-- Generated by the OpenACS Package Manager -->
 
Index: openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl,v
diff -u -r1.126.2.1 -r1.126.2.2
--- openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl	14 Feb 2019 16:15:00 -0000	1.126.2.1
+++ openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl	1 Mar 2019 12:12:37 -0000	1.126.2.2
@@ -963,7 +963,7 @@
         # After install Tcl proc callback
         apm_invoke_callback_proc -version_id $version_id -type after-install
 
-        set priority_mount_path [ad_decode $version(auto-mount) "" $mount_path $version(auto-mount)]
+        set priority_mount_path [expr {$version(auto-mount) eq "" ? $mount_path : $version(auto-mount)}]
         if { $priority_mount_path ne "" } {
             # This is a package that should be auto mounted